[FFmpeg-cvslog] sws: fix warning about RGB_PACK24_B_OPERANDS redefinition

Lukasz Marek git at videolan.org
Thu Apr 10 03:05:56 CEST 2014


ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki2 at gmail.com> | Wed Apr  9 22:25:43 2014 +0200| [fbf05759e38f075305667e2019d535f4e757c6e2] | committer: Michael Niedermayer

sws: fix warning about RGB_PACK24_B_OPERANDS redefinition

Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fbf05759e38f075305667e2019d535f4e757c6e2
---

 libswscale/x86/yuv2rgb_template.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libswscale/x86/yuv2rgb_template.c b/libswscale/x86/yuv2rgb_template.c
index b3225a4..2ff97e2 100644
--- a/libswscale/x86/yuv2rgb_template.c
+++ b/libswscale/x86/yuv2rgb_template.c
@@ -140,8 +140,10 @@
     "js   1b\n\t"                                \
 
 #if COMPILE_TEMPLATE_MMXEXT
+#undef RGB_PACK24_B_OPERANDS
 #define RGB_PACK24_B_OPERANDS NAMED_CONSTRAINTS_ADD(mask1101,mask0110,mask0100,mask0010,mask1001)
 #else
+#undef RGB_PACK24_B_OPERANDS
 #define RGB_PACK24_B_OPERANDS
 #endif
 



More information about the ffmpeg-cvslog mailing list