[vlc-commits] blend: fix Win32 warning; RGB is a system macro

[Rémi Denis-Courmont]

vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Jan 27 22:55:42 2012 +0200| [42d0d4454bf3357f7774d24e15466d0c6ac1dd4e] | committer: Jean-Baptiste Kempf

blend: fix Win32 warning; RGB is a system macro
(cherry picked from commit 31c91f0a8f61ddb0b30cc35c42feec0ef3abd1e4)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=42d0d4454bf3357f7774d24e15466d0c6ac1dd4e
---

 modules/video_filter/blend.cpp |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/modules/video_filter/blend.cpp b/modules/video_filter/blend.cpp
index ea5cd50..6c05d68 100644
--- a/modules/video_filter/blend.cpp
+++ b/modules/video_filter/blend.cpp
@@ -528,6 +528,8 @@ static const struct {
     vlc_fourcc_t     src;
     blend_function_t blend;
 } blends[] = {
+#undef RGB
+#undef YUV
 #define RGB(csp, picture, cvt) \
     { csp, VLC_CODEC_YUVA, Blend<picture, CPictureYUVA, compose<cvt, convertYuv8ToRgb> > }, \
     { csp, VLC_CODEC_RGBA, Blend<picture, CPictureRGBA, compose<cvt, convertNone> > }, \