summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Nguyen <kim@nguyen.vg>2011-07-13 00:12:08 (GMT)
committer Gavin Hurlbut <ghurlbut@mythtv.org>2011-07-13 00:15:31 (GMT)
commit2ed7b536bcee27ecb41d630e2db1251ff083cb97 (patch)
treea74e41af396903d3fb04d242b1e4922f3cedbe89
parent913c5ed3c709e511de381436561a6070b08afe33 (diff)
Fix PPC movrel issue in FFmpeg libs.
Fixes #9916 Cherry-picked from: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d16394f972dca8cc5e5b5bf9ab0b343a6239b76 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Gavin Hurlbut <ghurlbut@mythtv.org>
-rw-r--r--mythtv/external/FFmpeg/libavcodec/ppc/asm.S6
1 files changed, 5 insertions, 1 deletions
diff --git a/mythtv/external/FFmpeg/libavcodec/ppc/asm.S b/mythtv/external/FFmpeg/libavcodec/ppc/asm.S
index e372d53..2706d6b 100644
--- a/mythtv/external/FFmpeg/libavcodec/ppc/asm.S
+++ b/mythtv/external/FFmpeg/libavcodec/ppc/asm.S
@@ -67,7 +67,11 @@ X(\name):
.macro movrel rd, sym
#if CONFIG_PIC
- lwz \rd, \sym@got(r2)
+ bcl 20, 31, lab_pic_\@
+lab_pic_\@:
+ mflr \rd
+ addis \rd, \rd, (\sym - lab_pic_\@)@ha
+ addi \rd, \rd, (\sym - lab_pic_\@)@l
#else
lis \rd, \sym@ha
la \rd, \sym@l(\rd)