Commit 4b9392bb authored by Antoine Cellerier's avatar Antoine Cellerier

input.c: if available, use p_access->psz_path instead of psz_path when calling...

input.c: if available, use p_access->psz_path instead of psz_path when calling demux2_New since the access can change the path (ie http redirect).
parent 0e071fc0
...@@ -2272,14 +2272,17 @@ static int InputSourceInit( input_thread_t *p_input, ...@@ -2272,14 +2272,17 @@ 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, psz_path, in->p_demux = demux2_New( p_input, psz_access, psz_demux,
in->p_access->psz_path
? in->p_access->psz_path
: psz_path,
in->p_stream, p_input->p->p_es_out, in->p_stream, p_input->p->p_es_out,
p_input->b_preparsing ); p_input->b_preparsing );
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'",
psz_access, psz_demux, psz_path ); psz_access, psz_demux, psz_path );
intf_UserFatal( VLC_OBJECT( p_input), VLC_FALSE, intf_UserFatal( VLC_OBJECT( p_input ), VLC_FALSE,
_("Can't recognize the input's format"), _("Can't recognize the input's format"),
_("The format of '%s' can't be detected. " _("The format of '%s' can't be detected. "
"Have a look the log for details."), psz_mrl ); "Have a look the log for details."), psz_mrl );
......
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