[vlc-devel] [PATCH] input: check the pf_demux existance on the actual demuxer not the demux filter

Steve Lhomme robux4 at videolabs.io
Wed Jun 22 10:54:39 CEST 2016


---
 src/input/input.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/input/input.c b/src/input/input.c
index 214d0ae..0fc442f 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2297,6 +2297,7 @@ static input_source_t *InputSourceNew( input_thread_t *p_input,
         return NULL;
     }
 
+    const demux_t *p_demux = in->p_demux;
     char *psz_demux_chain = var_GetNonEmptyString(p_input, "demux-filter");
     /* add the chain of demux filters */
     demux_t *p_filtered_demux = demux_FilterChainNew( in->p_demux, psz_demux_chain );
@@ -2316,7 +2317,7 @@ static input_source_t *InputSourceNew( input_thread_t *p_input,
                        &in->b_can_pace_control ) )
         in->b_can_pace_control = false;
 
-    assert( in->p_demux->pf_demux != NULL || !in->b_can_pace_control );
+    assert( p_demux->pf_demux != NULL || !in->b_can_pace_control );
 
     if( !in->b_can_pace_control )
     {
-- 
2.8.2



More information about the vlc-devel mailing list