summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzuxy <zuxy@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-11 08:21:31 +0000
committerzuxy <zuxy@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-11 08:21:31 +0000
commit7c79acf4b2a05565cf944dde3e685813bd23c651 (patch)
tree7dd15d524d97aa19d25b8900ebdb3b9a7509ac29
parent83ff693d413b17269a65e385af421ee34a00ee5a (diff)
downloadmpv-7c79acf4b2a05565cf944dde3e685813bd23c651.tar.bz2
mpv-7c79acf4b2a05565cf944dde3e685813bd23c651.tar.xz
Avoid redefinition of RGB_PLANAR2PACKED24 as the template is included for
multiple times. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30273 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libswscale/x86/yuv2rgb_template.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libswscale/x86/yuv2rgb_template.c b/libswscale/x86/yuv2rgb_template.c
index b000dd2574..b6a1c3dca9 100644
--- a/libswscale/x86/yuv2rgb_template.c
+++ b/libswscale/x86/yuv2rgb_template.c
@@ -295,6 +295,7 @@ static inline int RENAME(yuv420_rgb15)(SwsContext *c, uint8_t* src[], int srcStr
YUV2RGB_OPERANDS
}
+#undef RGB_PLANAR2PACKED24
#if HAVE_MMX2
#define RGB_PLANAR2PACKED24(red, blue)\
"movq "MANGLE(ff_M24A)", %%mm4 \n\t"\