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

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e11ad5052e7f596b4a0ee1ab82bdb23409b37101
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Feb 1 13:35:02 2010 +0100

    backport libswscale CONFIG_RUNTIME_CPUDETECT related change to libswscale
    
    without this patch, the previous patch might not be effective

diff --git a/debian/patches/cpu-runtime-detect-libswscale.patch b/debian/patches/cpu-runtime-detect-libswscale.patch
new file mode 100644
index 0000000..58f49ae
--- /dev/null
+++ b/debian/patches/cpu-runtime-detect-libswscale.patch
@@ -0,0 +1,91 @@
+From: ramiro <ramiro at b3059339-0415-0410-9bf9-f77b7e298cf2>
+Date: Wed, 8 Apr 2009 20:21:21 +0000 (+0000)
+Subject: Rename RUNTIME_CPUDETECT to CONFIG_RUNTIME_CPUDETECT and always define it.
+X-Git-Url: http://git.ffmpeg.org/?p=libswscale;a=commitdiff_plain;h=ac1d1adfeecb0373e9a03d73b898eb6dcdeba334
+
+Rename RUNTIME_CPUDETECT to CONFIG_RUNTIME_CPUDETECT and always define it.
+
+
+git-svn-id: file:///var/local/repositories/mplayer/trunk/libswscale@29154 b3059339-0415-0410-9bf9-f77b7e298cf2
+---
+
+--- a/libswscale/swscale.c
++++ b/libswscale/swscale.c
+@@ -955,27 +955,27 @@ static inline void yuv2rgbXinC_full(SwsC
+ 
+ //Note: we have C, X86, MMX, MMX2, 3DNOW versions, there is no 3DNOW+MMX2 one
+ //Plain C versions
+-#if ((!HAVE_MMX || !CONFIG_GPL) && !HAVE_ALTIVEC) || defined (RUNTIME_CPUDETECT)
++#if ((!HAVE_MMX || !CONFIG_GPL) && !HAVE_ALTIVEC) || CONFIG_RUNTIME_CPUDETECT
+ #define COMPILE_C
+ #endif
+ 
+ #if ARCH_PPC
+-#if HAVE_ALTIVEC || defined (RUNTIME_CPUDETECT)
++#if HAVE_ALTIVEC || CONFIG_RUNTIME_CPUDETECT
+ #define COMPILE_ALTIVEC
+ #endif
+ #endif //ARCH_PPC
+ 
+ #if ARCH_X86
+ 
+-#if ((HAVE_MMX && !HAVE_AMD3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT)) && CONFIG_GPL
++#if ((HAVE_MMX && !HAVE_AMD3DNOW && !HAVE_MMX2) || CONFIG_RUNTIME_CPUDETECT) && CONFIG_GPL
+ #define COMPILE_MMX
+ #endif
+ 
+-#if (HAVE_MMX2 || defined (RUNTIME_CPUDETECT)) && CONFIG_GPL
++#if (HAVE_MMX2 || CONFIG_RUNTIME_CPUDETECT) && CONFIG_GPL
+ #define COMPILE_MMX2
+ #endif
+ 
+-#if ((HAVE_AMD3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT)) && CONFIG_GPL
++#if ((HAVE_AMD3DNOW && !HAVE_MMX2) || CONFIG_RUNTIME_CPUDETECT) && CONFIG_GPL
+ #define COMPILE_3DNOW
+ #endif
+ #endif //ARCH_X86
+@@ -1636,7 +1636,7 @@ static void globalInit(void){
+ 
+ static SwsFunc getSwsFunc(int flags){
+ 
+-#if defined(RUNTIME_CPUDETECT)
++#if CONFIG_RUNTIME_CPUDETECT
+ #if ARCH_X86 && CONFIG_GPL
+     // ordered per speed fastest first
+     if (flags & SWS_CPU_CAPS_MMX2)
+@@ -1657,7 +1657,7 @@ static SwsFunc getSwsFunc(int flags){
+ #endif
+     return swScale_C;
+ #endif /* ARCH_X86 && CONFIG_GPL */
+-#else //RUNTIME_CPUDETECT
++#else //CONFIG_RUNTIME_CPUDETECT
+ #if   HAVE_MMX2
+     return swScale_MMX2;
+ #elif HAVE_AMD3DNOW
+@@ -1669,7 +1669,7 @@ static SwsFunc getSwsFunc(int flags){
+ #else
+     return swScale_C;
+ #endif
+-#endif //!RUNTIME_CPUDETECT
++#endif //!CONFIG_RUNTIME_CPUDETECT
+ }
+ 
+ static int PlanarToNV12Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
+@@ -2193,7 +2193,7 @@ SwsContext *sws_getContext(int srcW, int
+         __asm__ volatile("emms\n\t"::: "memory");
+ #endif
+ 
+-#if !defined(RUNTIME_CPUDETECT) //ensure that the flags match the compiled variant if cpudetect is off
++#if !CONFIG_RUNTIME_CPUDETECT //ensure that the flags match the compiled variant if cpudetect is off
+     flags &= ~(SWS_CPU_CAPS_MMX|SWS_CPU_CAPS_MMX2|SWS_CPU_CAPS_3DNOW|SWS_CPU_CAPS_ALTIVEC|SWS_CPU_CAPS_BFIN);
+ #if   HAVE_MMX2
+     flags |= SWS_CPU_CAPS_MMX|SWS_CPU_CAPS_MMX2;
+@@ -2206,7 +2206,7 @@ SwsContext *sws_getContext(int srcW, int
+ #elif ARCH_BFIN
+     flags |= SWS_CPU_CAPS_BFIN;
+ #endif
+-#endif /* RUNTIME_CPUDETECT */
++#endif /* CONFIG_RUNTIME_CPUDETECT */
+     if (clip_table[512] != 255) globalInit();
+     if (!rgb15to16) sws_rgb2rgb_init(flags);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index a66fb32..ca46316 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,6 +11,7 @@ enable-versioning.patch
 use-normal-check_func-test-for-math-functions.patch
 wmapro-backport.patch
 cpu-runtime-detect.patch
+cpu-runtime-detect-libswscale.patch
 900_doxyfile
 901-fix-misc-typos.patch
 # fpic-ftbfs-fix.patch

-- 
FFmpeg packaging