# HG changeset patch # User zuxy # Date 1263198091 0 # Node ID f83934e1a950750f25415a1474e753ab8a9d3e82 # Parent 2de25e76d3313509f05779f5f5a9485b80e512cd Avoid redefinition of RGB_PLANAR2PACKED24 as the template is included for multiple times. diff -r 2de25e76d331 -r f83934e1a950 libswscale/x86/yuv2rgb_template.c --- a/libswscale/x86/yuv2rgb_template.c Mon Jan 11 07:30:28 2010 +0000 +++ b/libswscale/x86/yuv2rgb_template.c Mon Jan 11 08:21:31 2010 +0000 @@ -295,6 +295,7 @@ YUV2RGB_OPERANDS } +#undef RGB_PLANAR2PACKED24 #if HAVE_MMX2 #define RGB_PLANAR2PACKED24(red, blue)\ "movq "MANGLE(ff_M24A)", %%mm4 \n\t"\