RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

swscale: fix "ISO C90 forbids mixed declarations and code" warning 

only hit with --enable-runtime-cpudetect
This commit is contained in:
Janne Grunau 2011-04-15 09:12:34 +02:00
parent 7f2ae5c7af
commit f668afd489
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libswscale/swscale.c
View File

@ -1198,24 +1198,22 @@ SwsFunc ff_getSwsFunc(SwsContext *c)
sws_init_swScale_c(c); sws_init_swScale_c(c);
#if CONFIG_RUNTIME_CPUDETECT #if CONFIG_RUNTIME_CPUDETECT
int flags = c->flags;
#if ARCH_X86 #if ARCH_X86
// ordered per speed fastest first // ordered per speed fastest first
if (flags & SWS_CPU_CAPS_MMX2) { if (c->flags & SWS_CPU_CAPS_MMX2) {
sws_init_swScale_MMX2(c); sws_init_swScale_MMX2(c);
return swScale_MMX2; return swScale_MMX2;
} else if (flags & SWS_CPU_CAPS_3DNOW) { } else if (c->flags & SWS_CPU_CAPS_3DNOW) {
sws_init_swScale_3DNow(c); sws_init_swScale_3DNow(c);
return swScale_3DNow; return swScale_3DNow;
} else if (flags & SWS_CPU_CAPS_MMX) { } else if (c->flags & SWS_CPU_CAPS_MMX) {
sws_init_swScale_MMX(c); sws_init_swScale_MMX(c);
return swScale_MMX; return swScale_MMX;
} }
#else #else
#if COMPILE_ALTIVEC #if COMPILE_ALTIVEC
if (flags & SWS_CPU_CAPS_ALTIVEC) { if (c->flags & SWS_CPU_CAPS_ALTIVEC) {
sws_init_swScale_altivec(c); sws_init_swScale_altivec(c);
return swScale_altivec; return swScale_altivec;
} }