Commit 4e6bc360 authored by Laurent Aimar's avatar Laurent Aimar

Use picture helpers.

parent 815e38a8
...@@ -147,12 +147,9 @@ static picture_t *Deinterlace( filter_t *p_filter, picture_t *p_pic ) ...@@ -147,12 +147,9 @@ static picture_t *Deinterlace( filter_t *p_filter, picture_t *p_pic )
p_filter->pf_vout_buffer_del( p_filter, p_pic_dst ); p_filter->pf_vout_buffer_del( p_filter, p_pic_dst );
return NULL; return NULL;
} }
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 = true;
p_pic_dst->b_top_field_first = p_pic->b_top_field_first;
p_pic->pf_release( p_pic ); picture_CopyProperties( p_pic_dst, p_pic );
p_pic_dst->b_progressive = true;
picture_Release( p_pic );
return p_pic_dst; return p_pic_dst;
} }
...@@ -277,7 +277,7 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -277,7 +277,7 @@ static int OpenDecoder( vlc_object_t *p_this )
} }
else else
{ {
p_old->pf_release( p_old ); picture_Release( p_old );
} }
} }
} }
...@@ -314,7 +314,7 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -314,7 +314,7 @@ static int OpenDecoder( vlc_object_t *p_this )
} }
else else
{ {
p_old->pf_release( p_old ); picture_Release( p_old );
} }
} }
...@@ -376,7 +376,7 @@ static void CloseDecoder( vlc_object_t *p_this ) ...@@ -376,7 +376,7 @@ static void CloseDecoder( vlc_object_t *p_this )
picture_t *p_image = p_dec->p_sys->p_image; picture_t *p_image = p_dec->p_sys->p_image;
if( p_image != NULL ) if( p_image != NULL )
p_image->pf_release( p_image ); picture_Release( p_image );
vlc_mutex_destroy( &p_dec->p_sys->lock ); vlc_mutex_destroy( &p_dec->p_sys->lock );
free( p_dec->p_sys ); free( p_dec->p_sys );
...@@ -425,7 +425,7 @@ static int FakeCallback( vlc_object_t *p_this, char const *psz_var, ...@@ -425,7 +425,7 @@ static int FakeCallback( vlc_object_t *p_this, char const *psz_var,
} }
p_dec->p_sys->p_image = p_new_image; p_dec->p_sys->p_image = p_new_image;
p_image->pf_release( p_image ); picture_Release( p_image );
vlc_mutex_unlock( &p_dec->p_sys->lock ); vlc_mutex_unlock( &p_dec->p_sys->lock );
} }
else if( !strcmp( psz_var, "fake-file-reload" ) ) else if( !strcmp( psz_var, "fake-file-reload" ) )
......
...@@ -298,7 +298,7 @@ static void CloseDecoder( vlc_object_t *p_this ) ...@@ -298,7 +298,7 @@ static void CloseDecoder( vlc_object_t *p_this )
continue; continue;
if( p_sys->pp_images[i]->p_pic ) if( p_sys->pp_images[i]->p_pic )
p_sys->pp_images[i]->p_pic->pf_release( p_sys->pp_images[i]->p_pic ); picture_Release( p_sys->pp_images[i]->p_pic );
free( p_sys->pp_images[i]->psz_filename ); free( p_sys->pp_images[i]->psz_filename );
free( p_sys->pp_images[i] ); free( p_sys->pp_images[i] );
......
...@@ -161,7 +161,7 @@ static void CloseDecoder( vlc_object_t *p_this ) ...@@ -161,7 +161,7 @@ static void CloseDecoder( vlc_object_t *p_this )
continue; continue;
if( p_sys->pp_images[i]->p_pic ) if( p_sys->pp_images[i]->p_pic )
p_sys->pp_images[i]->p_pic->pf_release( p_sys->pp_images[i]->p_pic ); picture_Release( p_sys->pp_images[i] );
free( p_sys->pp_images[i]->psz_filename ); free( p_sys->pp_images[i]->psz_filename );
free( p_sys->pp_images[i] ); free( p_sys->pp_images[i] );
......
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