From 7c79acf4b2a05565cf944dde3e685813bd23c651 Mon Sep 17 00:00:00 2001 From: zuxy Date: Mon, 11 Jan 2010 08:21:31 +0000 Subject: 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 --- libswscale/x86/yuv2rgb_template.c | 1 + 1 file changed, 1 insertion(+) 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"\ -- cgit v1.2.3