har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swscale: Fix compilation with --disable-mmx2.

Browse Source 
Some MMX2 functions were being referenced without proper #ifdefs.
This commit is contained in:
Diego Biurrun 2011-06-15 00:52:43 +02:00
parent 4e05830205
commit 97e057ff81
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libswscale/x86/swscale_mmx.c
View File

@ -182,6 +182,8 @@ void ff_sws_init_swScale_mmx(SwsContext *c)
if (cpu_flags & AV_CPU_FLAG_MMX) if (cpu_flags & AV_CPU_FLAG_MMX)
sws_init_swScale_MMX(c); sws_init_swScale_MMX(c);
#if HAVE_MMX2
if (cpu_flags & AV_CPU_FLAG_MMX2) if (cpu_flags & AV_CPU_FLAG_MMX2)
sws_init_swScale_MMX2(c); sws_init_swScale_MMX2(c);
#endif
} }

4
libswscale/x86/yuv2rgb_mmx.c
View File

@ -72,12 +72,14 @@ SwsFunc ff_yuv2rgb_init_mmx(SwsContext *c)
c->srcFormat != PIX_FMT_YUVA420P) c->srcFormat != PIX_FMT_YUVA420P)
return NULL; return NULL;
if (HAVE_MMX2 && cpu_flags & AV_CPU_FLAG_MMX2) { #if HAVE_MMX2
if (cpu_flags & AV_CPU_FLAG_MMX2) {
switch (c->dstFormat) { switch (c->dstFormat) {
case PIX_FMT_RGB24: return yuv420_rgb24_MMX2; case PIX_FMT_RGB24: return yuv420_rgb24_MMX2;
case PIX_FMT_BGR24: return yuv420_bgr24_MMX2; case PIX_FMT_BGR24: return yuv420_bgr24_MMX2;
} }
} }
#endif
if (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX) { if (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX) {
switch (c->dstFormat) { switch (c->dstFormat) {