[vlc-commits] packetizer: flac: fix draining (#25122)

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Sep 29 11:21:28 2020 +0200| [eeae1274bf65d41988b83d8b5450d721a97383d9] | committer: Francois Cartegnie

packetizer: flac: fix draining (#25122)

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

 modules/packetizer/flac.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/packetizer/flac.c b/modules/packetizer/flac.c
index d58ee189f2..e7556d87b1 100644
--- a/modules/packetizer/flac.c
+++ b/modules/packetizer/flac.c
@@ -497,7 +497,7 @@ static block_t *Packetize(decoder_t *p_dec, block_t **pp_block)
             p_sys->i_offset = 0;
             p_sys->crc = 0;
 
-            if( block_BytestreamRemaining(&p_sys->bytestream) > 0 )
+            if( block_BytestreamRemaining(&p_sys->bytestream) > 0 || pp_block == NULL /* drain */)
                 p_sys->i_state = STATE_SEND_DATA;
             else
                 p_sys->i_state = STATE_NOSYNC;
@@ -509,7 +509,8 @@ static block_t *Packetize(decoder_t *p_dec, block_t **pp_block)
         p_dec->fmt_out.audio.i_channels = p_sys->headerinfo.i_channels;
         p_dec->fmt_out.audio.i_physical_channels = pi_channels_maps[p_sys->stream_info.channels];
 
-        if( p_sys->bytestream.p_block->i_pts > date_Get( &p_sys->pts ) &&
+        if( p_sys->bytestream.p_block &&
+            p_sys->bytestream.p_block->i_pts > date_Get( &p_sys->pts ) &&
             p_sys->bytestream.p_block->i_pts != VLC_TICK_INVALID )
         {
             date_Init( &p_sys->pts, p_sys->headerinfo.i_rate, 1 );