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

aout: inline aout_DecDeleteBuffer()

parent 32e1127d
...@@ -136,7 +136,6 @@ bool aout_ChangeFilterString( vlc_object_t *manager, vlc_object_t *aout, ...@@ -136,7 +136,6 @@ bool aout_ChangeFilterString( vlc_object_t *manager, vlc_object_t *aout,
int aout_DecNew(audio_output_t *, const audio_sample_format_t *, int aout_DecNew(audio_output_t *, const audio_sample_format_t *,
const audio_replay_gain_t *, const aout_request_vout_t *); const audio_replay_gain_t *, const aout_request_vout_t *);
void aout_DecDelete(audio_output_t *); void aout_DecDelete(audio_output_t *);
void aout_DecDeleteBuffer(audio_output_t *, block_t *);
int aout_DecPlay(audio_output_t *, block_t *, int i_input_rate); int aout_DecPlay(audio_output_t *, block_t *, int i_input_rate);
int aout_DecGetResetLost(audio_output_t *); int aout_DecGetResetLost(audio_output_t *);
void aout_DecChangePause(audio_output_t *, bool b_paused, mtime_t i_date); void aout_DecChangePause(audio_output_t *, bool b_paused, mtime_t i_date);
......
...@@ -182,15 +182,6 @@ void aout_RequestRestart (audio_output_t *aout, unsigned mode) ...@@ -182,15 +182,6 @@ void aout_RequestRestart (audio_output_t *aout, unsigned mode)
* Buffer management * Buffer management
*/ */
/*****************************************************************************
* aout_DecDeleteBuffer : destroy an undecoded buffer
*****************************************************************************/
void aout_DecDeleteBuffer (audio_output_t *aout, block_t *block)
{
(void) aout;
block_Release (block);
}
static void aout_StopResampling (audio_output_t *aout) static void aout_StopResampling (audio_output_t *aout)
{ {
aout_owner_t *owner = aout_owner (aout); aout_owner_t *owner = aout_owner (aout);
......
...@@ -1266,7 +1266,7 @@ static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block ) ...@@ -1266,7 +1266,7 @@ static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
if( DecoderIsExitRequested( p_dec ) ) if( DecoderIsExitRequested( p_dec ) )
{ {
/* It prevent freezing VLC in case of broken decoder */ /* It prevent freezing VLC in case of broken decoder */
aout_DecDeleteBuffer( p_aout, p_aout_buf ); block_Release( p_aout_buf );
if( p_block ) if( p_block )
block_Release( p_block ); block_Release( p_block );
break; break;
...@@ -1276,7 +1276,7 @@ static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block ) ...@@ -1276,7 +1276,7 @@ static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
if( p_owner->i_preroll_end > VLC_TS_INVALID && if( p_owner->i_preroll_end > VLC_TS_INVALID &&
p_aout_buf->i_pts < p_owner->i_preroll_end ) p_aout_buf->i_pts < p_owner->i_preroll_end )
{ {
aout_DecDeleteBuffer( p_aout, p_aout_buf ); block_Release( p_aout_buf );
continue; continue;
} }
......
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