]> git.sesse.net Git - vlc/commitdiff
sout: Don't wait until all the es has atleast minimum amount of blocks in fifo
authorIlkka Ollakka <ileoo@videolan.org>
Sun, 16 Feb 2014 09:53:30 +0000 (11:53 +0200)
committerIlkka Ollakka <ileoo@videolan.org>
Thu, 20 Feb 2014 06:52:00 +0000 (08:52 +0200)
So if one elemental stream stops inputing data to muxer, it can still mux
other tracks.

Ref #4520

src/stream_output/stream_output.c

index d01fed54b2e00146ac16c090669f3633278c467e..7fdba01185f37640fb24cf720d94ab69e499dd8f 100644 (file)
@@ -556,14 +556,7 @@ int sout_MuxGetStream( sout_mux_t *p_mux, int i_blocks, mtime_t *pi_dts )
         block_t *p_data;
 
         if( block_FifoCount( p_input->p_fifo ) < i_blocks )
-        {
-            if( p_input->p_fmt->i_cat != SPU_ES )
-            {
-                return -1;
-            }
-            /* FIXME: SPU muxing */
             continue;
-        }
 
         p_data = block_FifoShow( p_input->p_fifo );
         if( i_stream < 0 || p_data->i_dts < i_dts )