[vlc-commits] decoder: also drain the decoder when draining the packetizer

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Dec  3 15:20:09 2015 +0100| [7ada6eae5567c7d716ca03f3d7ddab90ce50e763] | committer: Thomas Guillem

decoder: also drain the decoder when draining the packetizer

When p_block was NULL, DecoderThread was draining its packetizer or its
decoder, but was not draining both (when a packetizer was used).

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

 src/input/decoder.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 7b90ee4..2b7aaf4 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -987,6 +987,9 @@ static void DecoderProcessVideo( decoder_t *p_dec, block_t *p_block )
                 p_packetized_block = p_next;
             }
         }
+        /* Drain the decoder after the packetizer is drained */
+        if( !p_block )
+            DecoderDecodeVideo( p_dec, NULL );
     }
     else
     {
@@ -1127,6 +1130,9 @@ static void DecoderProcessAudio( decoder_t *p_dec, block_t *p_block )
                 p_packetized_block = p_next;
             }
         }
+        /* Drain the decoder after the packetizer is drained */
+        if( !p_block )
+            DecoderDecodeAudio( p_dec, NULL );
     }
     else
     {