Ticket #10292: diff.txt

diff --git a/mythtv/external/FFmpeg/libavcodec/arm/vp8dsp_neon.S b/mythtv/external/FFmpeg/libavcodec/arm/vp8dsp_neon.S
index 01c3959..57c2813 100644
--- a/mythtv/external/FFmpeg/libavcodec/arm/vp8dsp_neon.S
+++ b/mythtv/external/FFmpeg/libavcodec/arm/vp8dsp_neon.S
@@ -1245,6 +1245,8 @@ function ff_put_vp8_epel8_h6v4_neon, export=1
         pop             {r4,pc}
 endfunc
 
+.ltorg
+
 function ff_put_vp8_epel8_h4v6_neon, export=1
         sub             r2,  r2,  r3,  lsl #1
         sub             r2,  r2,  #1
diff --git a/mythtv/libs/libmythui/mythrender_opengl.cpp b/mythtv/libs/libmythui/mythrender_opengl.cpp
index b7bf454..a3fdc96 100644
--- a/mythtv/libs/libmythui/mythrender_opengl.cpp
+++ b/mythtv/libs/libmythui/mythrender_opengl.cpp
@@ -1,3 +1,4 @@
+#include <dlfcn.h>
 #include <algorithm>
 using namespace std;
 
@@ -789,6 +790,9 @@ void* MythRenderOpenGL::GetProcAddress(const QString &proc) const
     void *result;
     for (int i = 0; i < 4; i++)
     {
+        result = dlsym(RTLD_NEXT, (proc + exts[i]).toLatin1().data());
+        if (result)
+            break;
         result = getProcAddress(proc + exts[i]);
         if (result)
             break;