Commit c36f1f2f authored by Laurent Aimar's avatar Laurent Aimar Committed by Derk-Jan Hartman

Do not warn about unsupported demux/access when aborting.

(cherry picked from commit ae5abca4)
Signed-off-by: default avatarDerk-Jan Hartman <hartman@videolan.org>
parent ae084578
...@@ -2478,12 +2478,15 @@ static int InputSourceInit( input_thread_t *p_input, ...@@ -2478,12 +2478,15 @@ static int InputSourceInit( input_thread_t *p_input,
/* Now try a real access */ /* Now try a real access */
in->p_access = access_New( p_input, psz_access, psz_demux, psz_path ); in->p_access = access_New( p_input, psz_access, psz_demux, psz_path );
if( in->p_access == NULL ) if( in->p_access == NULL )
{
if( vlc_object_alive( p_input ) )
{ {
msg_Err( p_input, "open of `%s' failed: %s", psz_mrl, msg_Err( p_input, "open of `%s' failed: %s", psz_mrl,
msg_StackMsg() ); msg_StackMsg() );
dialog_Fatal( p_input, _("Your input can't be opened"), dialog_Fatal( p_input, _("Your input can't be opened"),
_("VLC is unable to open the MRL '%s'." _("VLC is unable to open the MRL '%s'."
" Check the log for details."), psz_mrl ); " Check the log for details."), psz_mrl );
}
goto error; goto error;
} }
...@@ -2609,6 +2612,8 @@ static int InputSourceInit( input_thread_t *p_input, ...@@ -2609,6 +2612,8 @@ static int InputSourceInit( input_thread_t *p_input,
} }
if( in->p_demux == NULL ) if( in->p_demux == NULL )
{
if( vlc_object_alive( p_input ) )
{ {
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 );
...@@ -2616,6 +2621,7 @@ static int InputSourceInit( input_thread_t *p_input, ...@@ -2616,6 +2621,7 @@ static int InputSourceInit( input_thread_t *p_input,
_("VLC can't recognize the input's format"), _("VLC can't recognize the input's format"),
_("The format of '%s' cannot be detected. " _("The format of '%s' cannot be detected. "
"Have a look at the log for details."), psz_mrl ); "Have a look at the log for details."), psz_mrl );
}
goto error; goto error;
} }
......
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