[vlc-commits] aout: inline aout_DecDeleteBuffer()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Jul 26 19:05:29 2013 +0300| [fc29777107da4d172022621a407b1f11ba1d2db2] | committer: Rémi Denis-Courmont

aout: inline aout_DecDeleteBuffer()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fc29777107da4d172022621a407b1f11ba1d2db2
---

 src/audio_output/aout_internal.h |    1 -
 src/audio_output/dec.c           |    9 ---------
 src/input/decoder.c              |    4 ++--
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h
index f769ba1..10c790b 100644
--- 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 f476eb7..039417d 100644
--- 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 db06ea4..9c09681 100644
--- 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;
         }