summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukasz Marek <lukasz.m.luki2@gmail.com>2014-04-09 22:25:43 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-10 02:07:07 +0200
commitfbf05759e38f075305667e2019d535f4e757c6e2 (patch)
treefeb31fe3de9850edd59d69fe49311beab4870692
parent421c116fc498c2564823b96182c5baddcc0629b6 (diff)
downloadffmpeg-streaming-fbf05759e38f075305667e2019d535f4e757c6e2.zip
ffmpeg-streaming-fbf05759e38f075305667e2019d535f4e757c6e2.tar.gz
sws: fix warning about RGB_PACK24_B_OPERANDS redefinition
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libswscale/x86/yuv2rgb_template.c2
1 files changed, 2 insertions, 0 deletions
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
OpenPOWER on IntegriCloud