blend: fix Win32 warning; RGB is a system macro

31c91f0a · Rémi Denis-Courmont · a6d52f6f · 31c91f0a
Commit 31c91f0a authored Jan 27, 2012 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

modules/video_filter/blend.cpp modules/video_filter/blend.cpp +2 -0

No files found.
--- 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> > }, \