X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fvideo_filter%2Frv32.c;h=10c56995086892accff9fb7002a38283e3452a74;hb=848489c3863b1b7ddbe542aa3e746063722b9280;hp=6b406ca0ac11fb34f4de01b083c2bf0f30eb4ee5;hpb=3561b9b28f58eb7a4183e158a8fd973800d31ceb;p=vlc diff --git a/modules/video_filter/rv32.c b/modules/video_filter/rv32.c index 6b406ca0ac..10c5699508 100644 --- a/modules/video_filter/rv32.c +++ b/modules/video_filter/rv32.c @@ -77,10 +77,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; @@ -108,12 +105,10 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) unsigned int j; /* 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; } @@ -139,13 +134,9 @@ 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; + picture_CopyProperties( p_pic_dst, p_pic ); + picture_Release( p_pic ); - p_pic->pf_release( p_pic ); return p_pic_dst; }