[vlc-devel] [PATCH 1/8] sout: move code

Thomas Guillem thomas at gllm.fr
Mon Jan 29 18:25:49 CET 2018


Don't need to call pf_mux if the stream is unknown.
---
 src/stream_output/stream_output.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index 046ea2071f..2caf902c19 100644
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -489,18 +489,18 @@ void sout_MuxDeleteStream( sout_mux_t *p_mux, sout_input_t *p_input )
 {
     int i_index;
 
-    if( p_mux->b_waiting_stream
-     && block_FifoCount( p_input->p_fifo ) > 0 )
-    {
-        /* We stop waiting, and call the muxer for taking care of the data
-         * before we remove this es */
-        p_mux->b_waiting_stream = false;
-        p_mux->pf_mux( p_mux );
-    }
-
     TAB_FIND( p_mux->i_nb_inputs, p_mux->pp_inputs, p_input, i_index );
     if( i_index >= 0 )
     {
+        if( p_mux->b_waiting_stream
+         && block_FifoCount( p_input->p_fifo ) > 0 )
+        {
+            /* We stop waiting, and call the muxer for taking care of the data
+             * before we remove this es */
+            p_mux->b_waiting_stream = false;
+            p_mux->pf_mux( p_mux );
+        }
+
         p_mux->pf_delstream( p_mux, p_input );
 
         /* remove the entry */
-- 
2.11.0



More information about the vlc-devel mailing list