]> git.sesse.net Git - vlc/commitdiff
sout: only wait all ES if muxer can't add tracks in any point
authorIlkka Ollakka <ileoo@videolan.org>
Sun, 30 Nov 2014 13:37:42 +0000 (15:37 +0200)
committerIlkka Ollakka <ileoo@videolan.org>
Sun, 30 Nov 2014 13:38:06 +0000 (15:38 +0200)
src/stream_output/stream_output.c

index 36c9157167b7cd632340e563b6b501bdccb1f540..1a6418a7fa55d6cfbb6ea0fae75c521675df191f 100644 (file)
@@ -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 )
             {