Skip to content

V
vlc-2-2
Commit 3ae3e5f8 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

input: fix access-specified demux (fixes #11185)

parent 1516cebd
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 10 deletions
src/input/input.c
View file @ 3ae3e5f8
...@@ -2233,15 +2233,8 @@ static int InputSourceInit( input_thread_t *p_input, ...@@ -2233,15 +2233,8 @@ static int InputSourceInit( input_thread_t *p_input,
/* special hack for forcing a demuxer with --demux=module /* special hack for forcing a demuxer with --demux=module
* (and do nothing with a list) */ * (and do nothing with a list) */
psz_var_demux = var_GetNonEmptyString( p_input, "demux" ); psz_var_demux = var_GetNonEmptyString( p_input, "demux" );
if( psz_var_demux != NULL &&
!strchr(psz_var_demux, ',' ) &&
!strchr(psz_var_demux, ':' ) )
{
psz_demux = psz_var_demux; psz_demux = psz_var_demux;
msg_Dbg( p_input, "specified demux `%s'", psz_demux );
msg_Dbg( p_input, "enforced demux ` %s'", psz_demux );
}
} }
/* Try access_demux first */ /* Try access_demux first */
...@@ -2320,7 +2313,7 @@ static int InputSourceInit( input_thread_t *p_input, ...@@ -2320,7 +2313,7 @@ static int InputSourceInit( input_thread_t *p_input,
} }
/* Access-forced demuxer (PARENTAL ADVISORY: EXPLICIT HACK) */ /* Access-forced demuxer (PARENTAL ADVISORY: EXPLICIT HACK) */
if( !*psz_demux && *p_access->psz_demux ) if( !psz_demux[0] || !strcasecmp( psz_demux, "any" ) )
psz_demux = p_access->psz_demux; psz_demux = p_access->psz_demux;
/* */ /* */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment