Mercurial > mplayer.hg

changeset 30292:9086459837a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert r30331, which broke compilation. swScale_C is not templated if any optimization is to be used and !runtime_cpudetect.
author stefano
date Sat, 16 Jan 2010 19:51:26 +0000
parents 6719a8bcc039
children aeab18b1923d
files libswscale/swscale.c
diffstat 1 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libswscale/swscale.c	Sat Jan 16 19:32:58 2010 +0000
+++ b/libswscale/swscale.c	Sat Jan 16 19:51:26 2010 +0000
@@ -1863,14 +1863,23 @@
     } else if (flags & SWS_CPU_CAPS_MMX) {
         sws_init_swScale_MMX(c);
         return swScale_MMX;
+    } else {
+        sws_init_swScale_C(c);
+        return swScale_C;
     }
+
 #else
 #if ARCH_PPC
     if (flags & SWS_CPU_CAPS_ALTIVEC) {
         sws_init_swScale_altivec(c);
         return swScale_altivec;
+    } else {
+        sws_init_swScale_C(c);
+        return swScale_C;
     }
 #endif
+    sws_init_swScale_C(c);
+    return swScale_C;
 #endif /* ARCH_X86 && CONFIG_GPL */
 #else //CONFIG_RUNTIME_CPUDETECT
 #if   COMPILE_TEMPLATE_MMX2
@@ -1885,11 +1894,11 @@
 #elif COMPILE_TEMPLATE_ALTIVEC
     sws_init_swScale_altivec(c);
     return swScale_altivec;
+#else
+    sws_init_swScale_C(c);
+    return swScale_C;
 #endif
 #endif //!CONFIG_RUNTIME_CPUDETECT
-
-    sws_init_swScale_C(c);
-    return swScale_C;
 }
 
 static int PlanarToNV12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,