[vlc-commits] decoder: remove unnecessary special case

Rémi Denis-Courmont git at videolan.org
Sat Mar 21 18:48:23 CET 2015


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Mar 21 19:47:18 2015 +0200| [31268f2df54a433f2b50440bb504546bd19ed16a] | committer: Rémi Denis-Courmont

decoder: remove unnecessary special case

All audio decoders support the *pp_block == NULL case, and return NULL.
This enables audio decoders to drain cleanly.

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

 src/input/decoder.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index ce072a3..fdf8b18 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -1136,9 +1136,6 @@ static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
     int i_lost = 0;
     int i_played = 0;
 
-    if( p_block == NULL )
-        return; /* TODO: remove this check, drain audio decoders properly */
-
     while( (p_aout_buf = p_dec->pf_decode_audio( p_dec, &p_block )) )
     {
         if( DecoderIsFlushing( p_dec ) )



More information about the vlc-commits mailing list