Commit 707e35c8 authored by Ilkka Ollakka's avatar Ilkka Ollakka

stream_output: don't skip fifocount check on MuxGetStream

Even if we can add stream in any time, we should just continue
to next track if there isn't enough blocks in this track. Otherwise we
could try to query empty fifo.

ref #15747
parent ce6db786
...@@ -557,9 +557,10 @@ int sout_MuxGetStream( sout_mux_t *p_mux, unsigned i_blocks, mtime_t *pi_dts ) ...@@ -557,9 +557,10 @@ int sout_MuxGetStream( sout_mux_t *p_mux, unsigned i_blocks, mtime_t *pi_dts )
sout_input_t *p_input = p_mux->pp_inputs[i]; sout_input_t *p_input = p_mux->pp_inputs[i];
block_t *p_data; block_t *p_data;
if( (!p_mux->b_add_stream_any_time) && block_FifoCount( p_input->p_fifo ) < i_blocks ) if( block_FifoCount( p_input->p_fifo ) < i_blocks )
{ {
if( p_input->p_fmt->i_cat != SPU_ES ) if( (!p_mux->b_add_stream_any_time) &&
(p_input->p_fmt->i_cat != SPU_ES ) )
{ {
return -1; return -1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment