vlc | branch: master | Ilkka Ollakka <[email protected]> | Sun Nov 30 15:37:42 2014 +0200| [5b2c4304dfafc5ebe28f08a2993dfb2c62c55dec] | committer: Ilkka Ollakka
sout: only wait all ES if muxer can't add tracks in any point > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5b2c4304dfafc5ebe28f08a2993dfb2c62c55dec --- src/stream_output/stream_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c index 36c9157..1a6418a 100644 --- a/src/stream_output/stream_output.c +++ b/src/stream_output/stream_output.c @@ -558,7 +558,7 @@ 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]; block_t *p_data; - if( block_FifoCount( p_input->p_fifo ) < i_blocks ) + if( (!p_mux->b_add_stream_any_time) && block_FifoCount( p_input->p_fifo ) < i_blocks ) { if( p_input->p_fmt->i_cat != SPU_ES ) { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
