[vlc-devel] [PATCH] sout: Don't wait until all the es has atleast minimum amount of blocks in fifo

ileoo at videolan.org ileoo at videolan.org
Sun Feb 16 10:53:30 CET 2014


From: Ilkka Ollakka <ileoo at videolan.org>

So if one elemental stream stops inputing data to muxer, it can still mux
other tracks.
---
 src/stream_output/stream_output.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index d01fed5..7fdba01 100644
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -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 )
-- 
1.8.5.2




More information about the vlc-devel mailing list