[SCM] ffmpeg/master: Fix segmentation fault on ppc32, Closes: #639948

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 91b085a15c2c6795e3b81c511024318b160fcb31
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Sep 5 07:24:30 2011 +0200

    Fix segmentation fault on ppc32, Closes: #639948

diff --git a/debian/patches/03-fix-movrel.patch b/debian/patches/03-fix-movrel.patch
new file mode 100644
index 0000000..9650328
--- /dev/null
+++ b/debian/patches/03-fix-movrel.patch
@@ -0,0 +1,34 @@
+From: Kim Nguyen <kim at nguyen.vg>
+Date: Mon, 20 Jun 2011 22:18:54 +0000 (+0200)
+Subject: Fixes use of altivec flavor on PowerPC of libav-0.7
+X-Git-Tag: n0.8~20
+X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=2d16394f972dca8cc5e5b5bf9ab0b343a6239b76
+Reported-by: Elimar Riesebieter <riesebie at lxtec.de>
+Origin: http://ffmpeg.org/trac/ffmpeg/ticket/272#comment:8
+Bug: http://bugzilla.libav.org/show_bug.cgi?id=40
+Forwarded: http://bugzilla.libav.org/show_bug.cgi?id=40
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=639948
+Found by: Lennart Sorensen
+
+ppc32: Fix movrel
+
+Fixes ticket272
+---
+
+diff --git a/libavcodec/ppc/asm.S b/libavcodec/ppc/asm.S
+index e372d53..2706d6b 100644
+--- a/libavcodec/ppc/asm.S
++++ b/libavcodec/ppc/asm.S
+@@ -67,7 +67,11 @@ X(\name):
+ 
+ .macro movrel rd, sym
+ #if CONFIG_PIC
+-    lwz     \rd, \sym at 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 at ha
+     la      \rd, \sym at l(\rd)
diff --git a/debian/patches/series b/debian/patches/series
index 43960b9..905347b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,4 @@ post-0.7.1/0005-postprocess.c-filter-name-needs-to-be-double-0-termi.patch
 
 01-Tweak-doxygen-config.patch
 02-make-MAP_ANONYMOUS_AVAILABLE.patch
-
+03-fix-movrel.patch

-- 
Libav/FFmpeg packaging