diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-06-15 00:52:43 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-06-15 01:17:59 +0200 |
| commit | 97e057ff814c253c770f011736e33c0b65c9c663 (patch) | |
| tree | baca85fc242f44e439a6f8479457fab5b2d545fd /libswscale | |
| parent | 4e0583020567dd2062a908fe59aacba484e68049 (diff) | |
| download | ffmpeg-97e057ff814c253c770f011736e33c0b65c9c663.tar.gz | |
swscale: Fix compilation with --disable-mmx2.
Some MMX2 functions were being referenced without proper #ifdefs.
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/x86/swscale_mmx.c | 2 | ||||
| -rw-r--r-- | libswscale/x86/yuv2rgb_mmx.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libswscale/x86/swscale_mmx.c b/libswscale/x86/swscale_mmx.c index c86f75df51..f855a75212 100644 --- a/libswscale/x86/swscale_mmx.c +++ b/libswscale/x86/swscale_mmx.c @@ -182,6 +182,8 @@ void ff_sws_init_swScale_mmx(SwsContext *c) if (cpu_flags & AV_CPU_FLAG_MMX) sws_init_swScale_MMX(c); +#if HAVE_MMX2 if (cpu_flags & AV_CPU_FLAG_MMX2) sws_init_swScale_MMX2(c); +#endif } diff --git a/libswscale/x86/yuv2rgb_mmx.c b/libswscale/x86/yuv2rgb_mmx.c index 439482bb71..50f475a1ba 100644 --- a/libswscale/x86/yuv2rgb_mmx.c +++ b/libswscale/x86/yuv2rgb_mmx.c @@ -72,12 +72,14 @@ SwsFunc ff_yuv2rgb_init_mmx(SwsContext *c) c->srcFormat != PIX_FMT_YUVA420P) return NULL; - if (HAVE_MMX2 && cpu_flags & AV_CPU_FLAG_MMX2) { +#if HAVE_MMX2 + if (cpu_flags & AV_CPU_FLAG_MMX2) { switch (c->dstFormat) { case PIX_FMT_RGB24: return yuv420_rgb24_MMX2; case PIX_FMT_BGR24: return yuv420_bgr24_MMX2; } } +#endif if (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX) { switch (c->dstFormat) { |