[MPlayer-cvslog] r31587 - trunk/libmpdemux/demux_lavf.c

reimar subversion at mplayerhq.hu
Tue Jun 29 16:48:54 CEST 2010


Author: reimar
Date: Tue Jun 29 16:48:54 2010
New Revision: 31587

Log:
Avoid a crash if stream->url is not set, but print a warning since this
is not supposed to happen.

Modified:
   trunk/libmpdemux/demux_lavf.c

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	Tue Jun 29 14:13:57 2010	(r31586)
+++ trunk/libmpdemux/demux_lavf.c	Tue Jun 29 16:48:54 2010	(r31587)
@@ -181,6 +181,10 @@ static int lavf_check_file(demuxer_t *de
         }
         probe_data_size += read_size;
         avpd.filename= demuxer->stream->url;
+        if (!avpd.filename) {
+            mp_msg(MSGT_DEMUX, MSGL_WARN, "Stream url is not set!\n");
+            avpd.filename = "";
+        }
         if (!strncmp(avpd.filename, "ffmpeg://", 9))
             avpd.filename += 9;
         avpd.buf_size= probe_data_size;


More information about the MPlayer-cvslog mailing list