Commit dc3da6a2 authored by dionoea's avatar dionoea
Browse files

* src/input/input.c: Remove the access and demux part from the path string....

* src/input/input.c: Remove the access and demux part from the path string. (Fixes [20059] a bit ... even though it wasn't really broken)
parent 83038717
...@@ -2085,7 +2085,7 @@ static int InputSourceInit( input_thread_t *p_input, ...@@ -2085,7 +2085,7 @@ static int InputSourceInit( input_thread_t *p_input,
char *psz; char *psz;
vlc_value_t val; vlc_value_t val;
strcpy (psz_dup, psz_mrl); strcpy( psz_dup, psz_mrl );
if( !in ) return VLC_EGENERIC; if( !in ) return VLC_EGENERIC;
if( !p_input ) return VLC_EGENERIC; if( !p_input ) return VLC_EGENERIC;
...@@ -2272,12 +2272,28 @@ static int InputSourceInit( input_thread_t *p_input, ...@@ -2272,12 +2272,28 @@ static int InputSourceInit( input_thread_t *p_input,
{ {
psz_demux = in->p_access->psz_demux; psz_demux = in->p_access->psz_demux;
} }
in->p_demux = demux2_New( p_input, psz_access, psz_demux,
in->p_access->psz_path {
? in->p_access->psz_path /* Take access redirections into account */
: psz_path, char *psz_real_path;
in->p_stream, p_input->p->p_es_out, char *psz_buf = NULL;
p_input->b_preparsing ); if( in->p_access->psz_path )
{
psz_buf = strdup( in->p_access->psz_path );
char *psz_a, *psz_d;
MRLSplit( p_input, psz_buf, &psz_a, &psz_d, &psz_real_path );
}
else
{
psz_real_path = psz_path;
}
in->p_demux = demux2_New( p_input, psz_access, psz_demux,
psz_real_path,
in->p_stream, p_input->p->p_es_out,
p_input->b_preparsing );
free( psz_buf );
}
if( in->p_demux == NULL ) if( in->p_demux == NULL )
{ {
msg_Err( p_input, "no suitable demux module for `%s/%s://%s'", msg_Err( p_input, "no suitable demux module for `%s/%s://%s'",
......
Supports Markdown
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