[SCM] FFmpeg packaging branch, master, updated. debian/0.5.1-3-10-gc418284

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6e1151dc12f3607e61dec01fc86bf1f4e20ed0ba
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Wed Jun 2 10:12:36 2010 +0200

    Remove fix-ftbfs-altivec.patch, applied upstream.

diff --git a/debian/patches/fix-ftbfs-altivec.patch b/debian/patches/fix-ftbfs-altivec.patch
deleted file mode 100644
index 3f38e5f..0000000
--- a/debian/patches/fix-ftbfs-altivec.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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 && defined COMPILE_ALTIVEC
-     if (flags & SWS_CPU_CAPS_ALTIVEC)
-         return swScale_altivec;
-     else
diff --git a/debian/patches/series b/debian/patches/series
index cdb3ad6..104c330 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-fix-ftbfs-altivec.patch
 fix-qtrle-encoding-when-previous-frame-linesize.patch
 fix-dv-seeking.patch
 fix-constant-quant-encoding.patch

-- 
FFmpeg packaging