| 1 | diff --git a/mythtv/external/FFmpeg/libavcodec/arm/vp8dsp_neon.S b/mythtv/external/FFmpeg/libavcodec/arm/vp8dsp_neon.S
|
|---|
| 2 | index 01c3959..57c2813 100644
|
|---|
| 3 | --- a/mythtv/external/FFmpeg/libavcodec/arm/vp8dsp_neon.S
|
|---|
| 4 | +++ b/mythtv/external/FFmpeg/libavcodec/arm/vp8dsp_neon.S
|
|---|
| 5 | @@ -1245,6 +1245,8 @@ function ff_put_vp8_epel8_h6v4_neon, export=1
|
|---|
| 6 | pop {r4,pc}
|
|---|
| 7 | endfunc
|
|---|
| 8 |
|
|---|
| 9 | +.ltorg
|
|---|
| 10 | +
|
|---|
| 11 | function ff_put_vp8_epel8_h4v6_neon, export=1
|
|---|
| 12 | sub r2, r2, r3, lsl #1
|
|---|
| 13 | sub r2, r2, #1
|
|---|
| 14 | diff --git a/mythtv/libs/libmythui/mythrender_opengl.cpp b/mythtv/libs/libmythui/mythrender_opengl.cpp
|
|---|
| 15 | index b7bf454..a3fdc96 100644
|
|---|
| 16 | --- a/mythtv/libs/libmythui/mythrender_opengl.cpp
|
|---|
| 17 | +++ b/mythtv/libs/libmythui/mythrender_opengl.cpp
|
|---|
| 18 | @@ -1,3 +1,4 @@
|
|---|
| 19 | +#include <dlfcn.h>
|
|---|
| 20 | #include <algorithm>
|
|---|
| 21 | using namespace std;
|
|---|
| 22 |
|
|---|
| 23 | @@ -789,6 +790,9 @@ void* MythRenderOpenGL::GetProcAddress(const QString &proc) const
|
|---|
| 24 | void *result;
|
|---|
| 25 | for (int i = 0; i < 4; i++)
|
|---|
| 26 | {
|
|---|
| 27 | + result = dlsym(RTLD_NEXT, (proc + exts[i]).toLatin1().data());
|
|---|
| 28 | + if (result)
|
|---|
| 29 | + break;
|
|---|
| 30 | result = getProcAddress(proc + exts[i]);
|
|---|
| 31 | if (result)
|
|---|
| 32 | break;
|
|---|
