diff options
| author | sdrik <sdrik@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-03-24 07:09:19 +0000 |
|---|---|---|
| committer | sdrik <sdrik@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-03-24 07:09:19 +0000 |
| commit | e7d0a352fc6e715c15106548a39a2424c3722af7 (patch) | |
| tree | 096ca15ea2583e04311479918c8c4f1a08ae34bb /libswscale/yuv2rgb.c | |
| parent | 1b2ad6872121ebfff6978c6c270fa951410bfa3b (diff) | |
| download | mpv-e7d0a352fc6e715c15106548a39a2424c3722af7.tar.bz2 mpv-e7d0a352fc6e715c15106548a39a2424c3722af7.tar.xz | |
Simpler and more elegant fix to the x86_32/OSX+PIC build failure
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29046 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libswscale/yuv2rgb.c')
| -rw-r--r-- | libswscale/yuv2rgb.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c index dbdf9d99b2..112d4a375c 100644 --- a/libswscale/yuv2rgb.c +++ b/libswscale/yuv2rgb.c @@ -508,11 +508,8 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c) switch (c->dstFormat) { case PIX_FMT_RGB32: if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P){ -#if HAVE_7REGS - return yuva420_rgb32_MMX2; -#else + if (HAVE_7REGS) return yuva420_rgb32_MMX2; break; -#endif }else return yuv420_rgb32_MMX2; case PIX_FMT_BGR24: return yuv420_rgb24_MMX2; case PIX_FMT_RGB565: return yuv420_rgb16_MMX2; @@ -523,11 +520,8 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c) switch (c->dstFormat) { case PIX_FMT_RGB32: if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P){ -#if HAVE_7REGS - return yuva420_rgb32_MMX; -#else + if (HAVE_7REGS) return yuva420_rgb32_MMX; break; -#endif }else return yuv420_rgb32_MMX; case PIX_FMT_BGR24: return yuv420_rgb24_MMX; case PIX_FMT_RGB565: return yuv420_rgb16_MMX; |