[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090706-6-27-g7907f25

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9c415b92c1c4d235369c57a1cbd5f0f06e5c096d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 10 22:02:48 2010 +0100

    Fix compilation on powerpc with --disable-altivec
    
    in case altivec is disabled, even compilation of code using altivec
    keywords or asm must be avoided.

diff --git a/debian/patches/fix-ftbfs-altivec.patch b/debian/patches/fix-ftbfs-altivec.patch
new file mode 100644
index 0000000..f08a5fb
--- /dev/null
+++ b/debian/patches/fix-ftbfs-altivec.patch
@@ -0,0 +1,37 @@
+From: Reinhard Tartler <siretart at tauware.de>
+Subject: Fix compilation on powerpc with --disable-altivec
+
+backported from 0.5 branch:
+
+===================================================================
+r22436 | siretart | 2010-03-10 21:55:07 +0100 (Wed, 10 Mar 2010) | 7 lines
+
+Fix compilation on powerpc with --disable-altivec
+
+in case altivec is disabled, even compilation of code using altivec
+keywords or asm must be avoided.
+
+backport r30869 from mplayer repo by siretart
+
+Index: swscale.c
+===================================================================
+--- a/libswscale/swscale.c	(revision 21611)
++++ b/libswscale/swscale.c	(revision 22436)
+@@ -960,7 +960,7 @@
+ #endif
+ 
+ #if ARCH_PPC
+-#if HAVE_ALTIVEC || CONFIG_RUNTIME_CPUDETECT
++#if HAVE_ALTIVEC
+ #define COMPILE_ALTIVEC
+ #endif
+ #endif //ARCH_PPC
+@@ -1649,7 +1649,7 @@
+         return swScale_C;
+ 
+ #else
+-#if ARCH_PPC
++#if ARCH_PPC && COMPILE_ALTIVEC
+     if (flags & SWS_CPU_CAPS_ALTIVEC)
+         return swScale_altivec;
+     else
diff --git a/debian/patches/series b/debian/patches/series
index b11ca88..0595724 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 ffmpeg-debian_hurd.patch
+fix-ftbfs-altivec.patch
 fix-qtrle-encoding-when-previous-frame-linesize.patch
 fix-dv-seeking.patch
 fix-constant-quant-encoding.patch

-- 
FFmpeg packaging