[vlc-commits] packetizer: dirac: simplify dequeueing

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sun Dec  3 13:19:22 2017 +0100| [74f7456577df0865a15cae70e00e4ce9d7e1c583] | committer: Francois Cartegnie

packetizer: dirac: simplify dequeueing

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

 modules/packetizer/dirac.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/packetizer/dirac.c b/modules/packetizer/dirac.c
index be897c8374..31ec7f877f 100644
--- a/modules/packetizer/dirac.c
+++ b/modules/packetizer/dirac.c
@@ -1284,10 +1284,11 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block )
      * stop vlc discarding them */
     while( (p_block = p_sys->p_outqueue) )
     {
+        p_sys->p_outqueue = p_block->p_next;
+        p_block->p_next = NULL;
+
         if( p_block->i_flags & DIRAC_DISCARD )
         {
-            p_sys->p_outqueue = p_block->p_next;
-            p_block->p_next = NULL;
             block_Release( p_block );
             continue;
         }
@@ -1303,8 +1304,6 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block )
         p_sys->i_dts_last_out = p_block->i_dts;
         p_sys->i_pts_last_out = p_block->i_pts;
 
-        p_sys->p_outqueue = p_block->p_next;
-        p_block->p_next = NULL;
         /* clear any flags we set */
         p_block->i_flags &= ~BLOCK_FLAG_PRIVATE_MASK;
         block_ChainLastAppend( &pp_output, p_block );