Commit 11ac4b09 authored by Laurent Aimar's avatar Laurent Aimar

Removed now useless vout_CountPictureAvailable.

parent de67c3f7
......@@ -2252,9 +2252,6 @@ static void aout_del_buffer( decoder_t *p_dec, aout_buffer_t *p_buffer )
p_owner->p_aout_input, p_buffer );
}
int vout_CountPictureAvailable( vout_thread_t *p_vout );
static picture_t *vout_new_buffer( decoder_t *p_dec )
{
decoder_owner_sys_t *p_owner = p_dec->p_owner;
......@@ -2353,22 +2350,12 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
*/
for( ;; )
{
picture_t *p_picture;
if( p_dec->b_die || p_dec->b_error )
return NULL;
/* The video filter chain required that there is always 1 free buffer
* that it will use as temporary one. It will release the temporary
* buffer once its work is done, so this check is safe even if we don't
* lock around both count() and create().
*/
if( vout_CountPictureAvailable( p_owner->p_vout ) >= 2 )
{
p_picture = vout_CreatePicture( p_owner->p_vout, 0, 0, 0 );
if( p_picture )
return p_picture;
}
picture_t *p_picture = vout_CreatePicture( p_owner->p_vout, 0, 0, 0 );
if( p_picture )
return p_picture;
if( DecoderIsFlushing( p_dec ) )
return NULL;
......
......@@ -30,9 +30,6 @@
#ifndef _VOUT_CONTROL_H
#define _VOUT_CONTROL_H 1
/* DO NOT use vout_CountPictureAvailable unless your are in src/input/decoder.c (no exception) */
int vout_CountPictureAvailable( vout_thread_t * );
/**
* This function will (un)pause the display of pictures.
* It is thread safe
......
......@@ -70,12 +70,6 @@ void vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic )
* It needs locking since several pictures can be created by several producers
* threads.
*/
int vout_CountPictureAvailable( vout_thread_t *p_vout )
{
#warning "TODO remove vout_CountPictureAvailable"
return VOUT_MAX_PICTURES;
}
picture_t *vout_CreatePicture( vout_thread_t *p_vout,
bool b_progressive,
bool b_top_field_first,
......
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