]> git.sesse.net Git - vlc/commitdiff
Here too. (yeah, we now have video filters in modules/video_chroma and modules/video_...
authorAntoine Cellerier <dionoea@videolan.org>
Thu, 28 Aug 2008 17:09:48 +0000 (19:09 +0200)
committerAntoine Cellerier <dionoea@videolan.org>
Thu, 28 Aug 2008 17:09:48 +0000 (19:09 +0200)
modules/video_filter/rv32.c

index 10c56995086892accff9fb7002a38283e3452a74..313fd4eeafbb4f5316b7732f7f559af76e16d690 100644 (file)
@@ -69,11 +69,16 @@ static int OpenFilter( vlc_object_t *p_this )
 
     /* XXX Only support RV24 -> RV32 conversion */
     if( p_filter->fmt_in.video.i_chroma != VLC_FOURCC('R','V','2','4') ||
-        p_filter->fmt_out.video.i_chroma != VLC_FOURCC('R', 'V', '3', '2') )
+        (p_filter->fmt_out.video.i_chroma != VLC_FOURCC('R', 'V', '3', '2') &&
+        p_filter->fmt_out.video.i_chroma != VLC_FOURCC('R', 'G', 'B', 'A')) )
     {
         return VLC_EGENERIC;
     }
 
+    if( p_filter->fmt_in.video.i_width != p_filter->fmt_out.video.i_width
+     || p_filter->fmt_in.video.i_height != p_filter->fmt_out.video.i_height )
+        return -1;
+
     /* Allocate the memory needed to store the decoder's structure */
     if( ( p_filter->p_sys = p_sys =
           (filter_sys_t *)malloc(sizeof(filter_sys_t)) ) == NULL )