aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2011-04-15 09:12:34 +0200
committerJanne Grunau <janne-libav@jannau.net>2011-04-15 10:06:53 +0200
commitf668afd4896ee65683619b6f165dda4cdd46766f (patch)
tree4c4217f350921e5247d0f45ed6bd508e0f80ee54 /libswscale
parent7f2ae5c7af374dfe254195a9375974a2ff9395a7 (diff)
downloadffmpeg-f668afd4896ee65683619b6f165dda4cdd46766f.tar.gz
swscale: fix "ISO C90 forbids mixed declarations and code" warning
only hit with --enable-runtime-cpudetect
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/swscale.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 277a0d373c..9a4f89cdea 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -1198,24 +1198,22 @@ SwsFunc ff_getSwsFunc(SwsContext *c)
sws_init_swScale_c(c);
#if CONFIG_RUNTIME_CPUDETECT
- int flags = c->flags;
-
#if ARCH_X86
// ordered per speed fastest first
- if (flags & SWS_CPU_CAPS_MMX2) {
+ if (c->flags & SWS_CPU_CAPS_MMX2) {
sws_init_swScale_MMX2(c);
return swScale_MMX2;
- } else if (flags & SWS_CPU_CAPS_3DNOW) {
+ } else if (c->flags & SWS_CPU_CAPS_3DNOW) {
sws_init_swScale_3DNow(c);
return swScale_3DNow;
- } else if (flags & SWS_CPU_CAPS_MMX) {
+ } else if (c->flags & SWS_CPU_CAPS_MMX) {
sws_init_swScale_MMX(c);
return swScale_MMX;
}
#else
#if COMPILE_ALTIVEC
- if (flags & SWS_CPU_CAPS_ALTIVEC) {
+ if (c->flags & SWS_CPU_CAPS_ALTIVEC) {
sws_init_swScale_altivec(c);
return swScale_altivec;
}