X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fscale.c;h=159bd180fca315d1f9889bf6db0b74c9fcd80b1a;hb=3ea8408d39fdb61dd022f248b08081d4a9f45326;hp=b27aa2434b300c14de5d6e42e751695d89ca5910;hpb=3561b9b28f58eb7a4183e158a8fd973800d31ceb;p=vlc

diff --git a/modules/video_filter/scale.c b/modules/video_filter/scale.c
index b27aa2434b..159bd180fc 100644
--- a/modules/video_filter/scale.c
+++ b/modules/video_filter/scale.c
@@ -55,13 +55,11 @@ static picture_t *Filter( filter_t *, picture_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-vlc_module_begin();
-    set_description( N_("Video scaling filter") );
-    set_capability( "video filter2", 10000 );
-//    set_category( CAT_VIDEO );
-//    set_subcategory( SUBCAT_VIDEO_VFILTER2 );
-    set_callbacks( OpenFilter, CloseFilter );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Video scaling filter") )
+    set_capability( "video filter2", 10 )
+    set_callbacks( OpenFilter, CloseFilter )
+vlc_module_end ()
 
 /*****************************************************************************
  * OpenFilter: probe the filter and return score
@@ -75,6 +73,7 @@ static int OpenFilter( vlc_object_t *p_this )
           p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','U','V','A') &&
           p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','2','0') &&
           p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','V','1','2') &&
+          p_filter->fmt_in.video.i_chroma != VLC_FOURCC('R','V','3','2') &&
           p_filter->fmt_in.video.i_chroma != VLC_FOURCC('R','G','B','A') ) ||
         p_filter->fmt_in.video.i_chroma != p_filter->fmt_out.video.i_chroma )
     {
@@ -84,10 +83,7 @@ static int OpenFilter( vlc_object_t *p_this )
     /* 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 )
-    {
-        msg_Err( p_filter, "out of memory" );
-        return VLC_EGENERIC;
-    }
+        return VLC_ENOMEM;
 
     p_filter->pf_video_filter = Filter;
 
@@ -128,16 +124,15 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
         return NULL;
 
     /* Request output picture */
-    p_pic_dst = p_filter->pf_vout_buffer_new( p_filter );
+    p_pic_dst = filter_NewPicture( p_filter );
     if( !p_pic_dst )
     {
-        msg_Warn( p_filter, "can't get output picture" );
-        if( p_pic->pf_release )
-            p_pic->pf_release( p_pic );
+        picture_Release( p_pic );
         return NULL;
     }
 
-    if( p_filter->fmt_in.video.i_chroma != VLC_FOURCC('R','G','B','A') )
+    if( p_filter->fmt_in.video.i_chroma != VLC_FOURCC('R','G','B','A') &&
+        p_filter->fmt_in.video.i_chroma != VLC_FOURCC('R','V','3','2') )
     {
         for( i_plane = 0; i_plane < p_pic_dst->i_planes; i_plane++ )
         {
@@ -228,13 +223,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
         }
     }
 
-    p_pic_dst->date = p_pic->date;
-    p_pic_dst->b_force = p_pic->b_force;
-    p_pic_dst->i_nb_fields = p_pic->i_nb_fields;
-    p_pic_dst->b_progressive = p_pic->b_progressive;
-    p_pic_dst->b_top_field_first = p_pic->b_top_field_first;
-
-    if( p_pic->pf_release )
-        p_pic->pf_release( p_pic );
+    picture_CopyProperties( p_pic_dst, p_pic );
+    picture_Release( p_pic );
     return p_pic_dst;
 }