]> git.sesse.net Git - vlc/commitdiff
input.c: if available, use p_access->psz_path instead of psz_path when calling demux2...
authorAntoine Cellerier <dionoea@videolan.org>
Fri, 11 May 2007 22:15:45 +0000 (22:15 +0000)
committerAntoine Cellerier <dionoea@videolan.org>
Fri, 11 May 2007 22:15:45 +0000 (22:15 +0000)
src/input/input.c

index 870a9bc3b7bc1b42e312f334237cd9d98c28f39f..205d66f51903a031650a548369818e36ceb10108 100644 (file)
@@ -2272,14 +2272,17 @@ static int InputSourceInit( input_thread_t *p_input,
         {
             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,
                                   p_input->b_preparsing );
         if( in->p_demux == NULL )
         {
             msg_Err( p_input, "no suitable demux module for `%s/%s://%s'",
                      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"),
                             _("The format of '%s' can't be detected. "
                             "Have a look the log for details."), psz_mrl );