Skip to content

V
vlc
Commit 42d0d445 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont Committed by Jean-Baptiste Kempf
Browse files
Options

blend: fix Win32 warning; RGB is a system macro 

(cherry picked from commit 31c91f0a)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent a0ca2ab7
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
modules/video_filter/blend.cpp
View file @ 42d0d445
...@@ -528,6 +528,8 @@ static const struct { ...@@ -528,6 +528,8 @@ static const struct {
vlc_fourcc_t src; vlc_fourcc_t src;
blend_function_t blend; blend_function_t blend;
} blends[] = { } blends[] = {
#undef RGB
#undef YUV
#define RGB(csp, picture, cvt) \ #define RGB(csp, picture, cvt) \
{ csp, VLC_CODEC_YUVA, Blend<picture, CPictureYUVA, compose<cvt, convertYuv8ToRgb> > }, \ { csp, VLC_CODEC_YUVA, Blend<picture, CPictureYUVA, compose<cvt, convertYuv8ToRgb> > }, \
{ csp, VLC_CODEC_RGBA, Blend<picture, CPictureRGBA, compose<cvt, convertNone> > }, \ { csp, VLC_CODEC_RGBA, Blend<picture, CPictureRGBA, compose<cvt, convertNone> > }, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment