Commit 58c8d782 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

vout: remove vout_ReleasePicture()

parent b8c35c76
......@@ -152,8 +152,6 @@ VLC_API void vout_ChangeAspectRatio( vout_thread_t *p_vout,
VLC_API picture_t * vout_GetPicture( vout_thread_t * );
VLC_API void vout_PutPicture( vout_thread_t *, picture_t * );
VLC_API void vout_ReleasePicture( vout_thread_t *, picture_t * );
/* */
VLC_API void vout_PutSubpicture( vout_thread_t *, subpicture_t * );
VLC_API int vout_RegisterSubpictureChannel( vout_thread_t * );
......
......@@ -1296,7 +1296,7 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture,
{
msg_Warn( p_dec, "non-dated video buffer received" );
*pi_lost_sum += 1;
vout_ReleasePicture( p_vout, p_picture );
picture_Release( p_picture );
return;
}
......@@ -1349,7 +1349,7 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture,
msg_Warn( p_dec, "non-dated video buffer received" );
*pi_lost_sum += 1;
vout_ReleasePicture( p_vout, p_picture );
picture_Release( p_picture );
}
int i_tmp_display;
int i_tmp_lost;
......@@ -1373,7 +1373,7 @@ static void DecoderDecodeVideo( decoder_t *p_dec, block_t *p_block )
if( DecoderIsExitRequested( p_dec ) )
{
/* It prevent freezing VLC in case of broken decoder */
vout_ReleasePicture( p_vout, p_pic );
picture_Release( p_pic );
if( p_block )
block_Release( p_block );
break;
......@@ -1383,7 +1383,7 @@ static void DecoderDecodeVideo( decoder_t *p_dec, block_t *p_block )
if( p_owner->i_preroll_end > VLC_TS_INVALID && p_pic->date < p_owner->i_preroll_end )
{
vout_ReleasePicture( p_vout, p_pic );
picture_Release( p_pic );
continue;
}
......@@ -2187,12 +2187,12 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
static void vout_del_buffer( decoder_t *p_dec, picture_t *p_pic )
{
vout_ReleasePicture( p_dec->p_owner->p_vout, p_pic );
picture_Release( p_pic );
}
static void vout_unlink_picture( decoder_t *p_dec, picture_t *p_pic )
{
vout_ReleasePicture( p_dec->p_owner->p_vout, p_pic );
picture_Release( p_pic );
}
static subpicture_t *spu_new_buffer( decoder_t *p_dec,
......
......@@ -614,7 +614,6 @@ vout_ChangeAspectRatio
vout_Close
vout_GetPicture
vout_PutPicture
vout_ReleasePicture
vout_PutSubpicture
vout_RegisterSubpictureChannel
vout_FlushSubpictureChannel
......
......@@ -401,9 +401,9 @@ void vout_FlushSubpictureChannel( vout_thread_t *vout, int channel )
* It retreives a picture from the vout or NULL if no pictures are
* available yet.
*
* You MUST call vout_PutPicture or vout_ReleasePicture on it.
* You MUST call vout_PutPicture or picture_Release on it.
*
* You may use picture_Hold() (paired with vout_ReleasePicture()) to keep a
* You may use picture_Hold() (paired with picture_Release()) to keep a
* read-only reference.
*/
picture_t *vout_GetPicture(vout_thread_t *vout)
......@@ -433,14 +433,6 @@ void vout_PutPicture(vout_thread_t *vout, picture_t *picture)
vout_control_Wake(&vout->p->control);
}
/**
* It releases a picture retreived by vout_GetPicture.
*/
void vout_ReleasePicture(vout_thread_t *vout, picture_t *picture)
{
picture_Release(picture);
}
/* */
int vout_GetSnapshot(vout_thread_t *vout,
block_t **image_dst, picture_t **picture_dst,
......
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