vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Apr 12 22:09:32 2014 +0300| [3ae3e5f8b293a14bc05ac43219cd9bae80fa07e8] | committer: Rémi Denis-Courmont
input: fix access-specified demux (fixes #11185) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3ae3e5f8b293a14bc05ac43219cd9bae80fa07e8 --- src/input/input.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/input/input.c b/src/input/input.c index bec3f93..0b8fae7 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -2233,15 +2233,8 @@ static int InputSourceInit( input_thread_t *p_input, /* special hack for forcing a demuxer with --demux=module * (and do nothing with a list) */ 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; - - msg_Dbg( p_input, "enforced demux ` %s'", psz_demux ); - } + psz_demux = psz_var_demux; + msg_Dbg( p_input, "specified demux `%s'", psz_demux ); } /* Try access_demux first */ @@ -2320,7 +2313,7 @@ static int InputSourceInit( input_thread_t *p_input, } /* 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; /* */ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
