Commit eb4fd245 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Preparsing only works with file:// - only try files.


Signed-off-by: Rémi Denis-Courmont's avatarRémi Denis-Courmont <rem@videolan.org>
parent e065942c
...@@ -2181,13 +2181,12 @@ static int InputSourceInit( input_thread_t *p_input, ...@@ -2181,13 +2181,12 @@ static int InputSourceInit( input_thread_t *p_input,
if( !p_input ) return VLC_EGENERIC; if( !p_input ) return VLC_EGENERIC;
/* Split uri */ /* Split uri */
MRLSplit( psz_dup, &psz_access, &psz_demux, &psz_path );
msg_Dbg( p_input, "`%s' gives access `%s' demux `%s' path `%s'",
psz_mrl, psz_access, psz_demux, psz_path );
if( !p_input->b_preparsing ) if( !p_input->b_preparsing )
{ {
MRLSplit( psz_dup, &psz_access, &psz_demux, &psz_path );
msg_Dbg( p_input, "`%s' gives access `%s' demux `%s' path `%s'",
psz_mrl, psz_access, psz_demux, psz_path );
/* Hack to allow udp://@:port syntax */ /* Hack to allow udp://@:port syntax */
if( !psz_access || if( !psz_access ||
(strncmp( psz_access, "udp", 3 ) && (strncmp( psz_access, "udp", 3 ) &&
...@@ -2227,12 +2226,14 @@ static int InputSourceInit( input_thread_t *p_input, ...@@ -2227,12 +2226,14 @@ static int InputSourceInit( input_thread_t *p_input,
} }
else else
{ {
psz_path = psz_dup; /* Preparsing is only for file:// */
if( !strncmp( psz_path, "file://", 7 ) ) if( psz_demux && *psz_demux )
psz_path += 7; goto error;
if( !psz_access || !*psz_access ) /* path without scheme:// */
psz_access = "file";
if( strcmp( psz_access, "file" ) )
goto error;
msg_Dbg( p_input, "trying to pre-parse %s", psz_path ); msg_Dbg( p_input, "trying to pre-parse %s", psz_path );
psz_demux = "";
psz_access = "file";
} }
if( in->p_demux ) if( in->p_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