]> git.sesse.net Git - vlc/commitdiff
blend: fix Win32 warning; RGB is a system macro
authorRémi Denis-Courmont <remi@remlab.net>
Fri, 27 Jan 2012 20:55:42 +0000 (22:55 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Fri, 27 Jan 2012 21:31:48 +0000 (23:31 +0200)
modules/video_filter/blend.cpp

index ea5cd500526b751db825fd68ae6b9232c9158288..6c05d68a66d7119685d2e118615b857108646c20 100644 (file)
@@ -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> > }, \