Merge branch 1.0-bugfix

[vlc] / modules / video_filter / mosaic.c

diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index a8d60f0c5a13191c08b96cd2d6b9ebf44d5df7a0..d9488f9807ce4c16e09f9e681151a57793fcc3bf 100644 (file)
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -31,7 +31,6 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout.h>
 
 #include <math.h>
 #include <limits.h> /* INT_MAX */
@@ -596,11 +595,11 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
             fmt_in.i_height = p_es->p_picture->format.i_height;
             fmt_in.i_width = p_es->p_picture->format.i_width;
 
-            if( fmt_in.i_chroma == VLC_FOURCC('Y','U','V','A') ||
-                fmt_in.i_chroma == VLC_FOURCC('R','G','B','A') )
-                fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A');
+            if( fmt_in.i_chroma == VLC_CODEC_YUVA ||
+                fmt_in.i_chroma == VLC_CODEC_RGBA )
+                fmt_out.i_chroma = VLC_CODEC_YUVA;
             else
-                fmt_out.i_chroma = VLC_FOURCC('I','4','2','0');
+                fmt_out.i_chroma = VLC_CODEC_I420;
             fmt_out.i_width = col_inner_width;
             fmt_out.i_height = row_inner_height;