From 52c0fcaf52148b17c883fcc255828884b23368d3 Mon Sep 17 00:00:00 2001 From: Zuxy Meng Date: Mon, 11 Jan 2010 08:21:31 +0000 Subject: Avoid redefinition of RGB_PLANAR2PACKED24 as the template is included for multiple times. Originally committed as revision 30273 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale --- libswscale/x86/yuv2rgb_template.c | 1 + 1 file changed, 1 insertion(+) (limited to 'libswscale/x86/yuv2rgb_template.c') 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