[Mplayer-cvslog] CVS: main/libmpdemux demux_mov.c,1.88,1.89

Filip Kalinski CVS filon at mplayerhq.hu
Mon Jan 6 22:27:55 CET 2003


Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv28353/libmpdemux

Modified Files:
	demux_mov.c 
Log Message:
Fix segmentation fault when choose non-existant stream with -{a,v}vid.
10l :-)


Index: demux_mov.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- demux_mov.c	14 Dec 2002 17:56:06 -0000	1.88
+++ demux_mov.c	6 Jan 2003 21:27:34 -0000	1.89
@@ -1474,10 +1474,14 @@
     // setup sh pointers:
     if(demuxer->audio->id>=0){
 	sh_audio_t* sh=demuxer->a_streams[demuxer->audio->id];
+	if (!sh)
+	    return -1;
 	demuxer->audio->sh=sh; sh->ds=demuxer->audio;
     }
     if(demuxer->video->id>=0){
 	sh_video_t* sh=demuxer->v_streams[demuxer->video->id];
+	if (!sh)
+	    return -1;
 	demuxer->video->sh=sh; sh->ds=demuxer->video;
     }
 



More information about the MPlayer-cvslog mailing list