vlc | branch: master | Ilkka Ollakka <[email protected]> | Sat Nov 29 12:23:28 2014 +0200| [e2c7381b34bc0038d61efc8c93d0ad6feb8b1ca7] | committer: Ilkka Ollakka
Revert "sout: Don't wait until all the es has atleast minimum amount of blocks in fifo" This reverts commit 57b356e2e2f646f7907a1518dbe605fc9899bc02. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e2c7381b34bc0038d61efc8c93d0ad6feb8b1ca7 --- src/stream_output/stream_output.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c index 4b4c89e..36c9157 100644 --- a/src/stream_output/stream_output.c +++ b/src/stream_output/stream_output.c @@ -559,7 +559,14 @@ int sout_MuxGetStream( sout_mux_t *p_mux, unsigned 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 ) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
