Commit d1d3d7b4 authored by Laurent Aimar's avatar Laurent Aimar

Used filter_New/DeletePicture when applicable.

parent f1e3b554
...@@ -189,7 +189,6 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) ...@@ -189,7 +189,6 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
if( p_sys->p_pic != NULL ) if( p_sys->p_pic != NULL )
picture_Release( p_sys->p_pic ); picture_Release( p_sys->p_pic );
p_sys->p_pic = decoder_NewPicture( p_dec ); p_sys->p_pic = decoder_NewPicture( p_dec );
p_sys->p_pic = p_dec->pf_vout_buffer_new( p_dec );
p_sys->p_pic->b_force = true; p_sys->p_pic->b_force = true;
p_sys->p_pic->p->i_pitch = p_dec->p_sys->i_pitch; p_sys->p_pic->p->i_pitch = p_dec->p_sys->i_pitch;
p_sys->p_pic->date = p_block->i_pts > 0 ? p_block->i_pts : p_block->i_dts; p_sys->p_pic->date = p_block->i_pts > 0 ? p_block->i_pts : p_block->i_dts;
......
...@@ -459,7 +459,7 @@ static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic ) ...@@ -459,7 +459,7 @@ static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic )
return NULL; return NULL;
} }
p_outpic = p_filter->pf_vout_buffer_new( p_filter ); p_outpic = filter_NewPicture( p_filter );
if( !p_outpic ) if( !p_outpic )
{ {
msg_Warn( p_filter, "can't get output picture" ); msg_Warn( p_filter, "can't get output picture" );
......
...@@ -285,13 +285,12 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) ...@@ -285,13 +285,12 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
*****************************************************************************/ *****************************************************************************/
static picture_t *video_new( filter_t *p_filter ) static picture_t *video_new( filter_t *p_filter )
{ {
return ((filter_t*)p_filter->p_owner)->pf_vout_buffer_new( (filter_t*)p_filter->p_owner ); return filter_NewPicture( (filter_t*)p_filter->p_owner );
} }
static void video_del( filter_t *p_filter, picture_t *p_pic ) static void video_del( filter_t *p_filter, picture_t *p_pic )
{ {
if( ((filter_t*)p_filter->p_owner)->pf_vout_buffer_del ) return filter_DeletePicture( (filter_t*)p_filter->p_owner, p_pic );
((filter_t*)p_filter->p_owner)->pf_vout_buffer_del( (filter_t*)p_filter->p_owner, p_pic );
} }
static int alloc_init( filter_t *p_filter, void *p_data ) static int alloc_init( filter_t *p_filter, void *p_data )
......
...@@ -220,13 +220,13 @@ static picture_t *BufferNew( filter_t *p_filter ) ...@@ -220,13 +220,13 @@ static picture_t *BufferNew( filter_t *p_filter )
{ {
filter_t *p_parent = (filter_t*)p_filter->p_owner; filter_t *p_parent = (filter_t*)p_filter->p_owner;
return p_parent->pf_vout_buffer_new( p_parent ); return filter_NewPicture( p_parent );
} }
static void BufferDel( filter_t *p_filter, picture_t *p_pic ) static void BufferDel( filter_t *p_filter, picture_t *p_pic )
{ {
filter_t *p_parent = (filter_t*)p_filter->p_owner; filter_t *p_parent = (filter_t*)p_filter->p_owner;
p_parent->pf_vout_buffer_del( p_parent, p_pic ); return filter_DeletePicture( p_parent, p_pic );
} }
static int BufferAllocationInit ( filter_t *p_filter, void *p_data ) static int BufferAllocationInit ( filter_t *p_filter, void *p_data )
{ {
......
...@@ -186,7 +186,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) ...@@ -186,7 +186,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
return NULL; return NULL;
/* Request output picture */ /* 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 ) if( !p_pic_dst )
{ {
msg_Warn( p_filter, "can't get output picture" ); msg_Warn( p_filter, "can't get output picture" );
......
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