aout: inline aout_DecDeleteBuffer()

diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h
index f769ba1a034534114888c57e90085a4cca87edcb..10c790b383b8b1989aa71c0c7500230bb2882e51 100644 (file)
--- a/src/audio_output/aout_internal.h
+++ b/src/audio_output/aout_internal.h
@@ -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 *,
                 const audio_replay_gain_t *, const aout_request_vout_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_DecGetResetLost(audio_output_t *);
 void aout_DecChangePause(audio_output_t *, bool b_paused, mtime_t i_date);

diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c
index f476eb7aaa20145fa9f1f9963238f375bb34eb72..039417d15a72a0113ec75ab222f2527d21641dcd 100644 (file)
--- a/src/audio_output/dec.c
+++ b/src/audio_output/dec.c
@@ -182,15 +182,6 @@ void aout_RequestRestart (audio_output_t *aout, unsigned mode)
  * 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)
 {
     aout_owner_t *owner = aout_owner (aout);

diff --git a/src/input/decoder.c b/src/input/decoder.c
index db06ea4751d0e27f467986ceb627f522e8148908..9c096812980e606d78f192f07b1ac331d4e07075 100644 (file)
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -1266,7 +1266,7 @@ static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
         if( DecoderIsExitRequested( p_dec ) )
         {
             /* It prevent freezing VLC in case of broken decoder */
-            aout_DecDeleteBuffer( p_aout, p_aout_buf );
+            block_Release( p_aout_buf );
             if( p_block )
                 block_Release( p_block );
             break;
@@ -1276,7 +1276,7 @@ static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
         if( p_owner->i_preroll_end > VLC_TS_INVALID &&
             p_aout_buf->i_pts < p_owner->i_preroll_end )
         {
-            aout_DecDeleteBuffer( p_aout, p_aout_buf );
+            block_Release( p_aout_buf );
             continue;
         }