[vlc-commits] decoder: fix decoder drained when using a packetizer

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Dec 15 10:08:42 2015 +0100| [4fe75d523a79c3ab7f37ac3e764b32ab82e97d1b] | committer: Thomas Guillem

decoder: fix decoder drained when using a packetizer

The packetizer set the *pp_block to NULL, therefore p_block was NULL too.

This fixes a regression from 7ada6eae5567c7d716ca03f3d7ddab90ce50e763

Closes #16128

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

 src/input/decoder.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 1f4cdfd..e054b16 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -1036,7 +1036,7 @@ static void DecoderProcessVideo( decoder_t *p_dec, block_t *p_block )
             }
         }
         /* Drain the decoder after the packetizer is drained */
-        if( !p_block )
+        if( !pp_block )
             DecoderDecodeVideo( p_dec, NULL );
     }
     else
@@ -1217,7 +1217,7 @@ static void DecoderProcessAudio( decoder_t *p_dec, block_t *p_block )
             }
         }
         /* Drain the decoder after the packetizer is drained */
-        if( !p_block )
+        if( !pp_block )
             DecoderDecodeAudio( p_dec, NULL );
     }
     else