Commit 57b356e2 authored by Ilkka Ollakka's avatar Ilkka Ollakka

sout: Don't wait until all the es has atleast minimum amount of blocks in fifo

So if one elemental stream stops inputing data to muxer, it can still mux
other tracks.

Ref #4520
parent 73e62faf
...@@ -556,14 +556,7 @@ int sout_MuxGetStream( sout_mux_t *p_mux, int i_blocks, mtime_t *pi_dts ) ...@@ -556,14 +556,7 @@ int sout_MuxGetStream( sout_mux_t *p_mux, int i_blocks, mtime_t *pi_dts )
block_t *p_data; block_t *p_data;
if( 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 )
{
return -1;
}
/* FIXME: SPU muxing */
continue; continue;
}
p_data = block_FifoShow( p_input->p_fifo ); p_data = block_FifoShow( p_input->p_fifo );
if( i_stream < 0 || p_data->i_dts < i_dts ) if( i_stream < 0 || p_data->i_dts < i_dts )
......
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