[Mplayer-cvslog] CVS: main mplayer.c,1.750,1.751

[Roberto Togni CVS]

CVS change done by Roberto Togni CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv7349

Modified Files:
	mplayer.c 
Log Message:
Fix segfault if EDL is used without video
Based on a patch by adland


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.750
retrieving revision 1.751
diff -u -r1.750 -r1.751
--- mplayer.c	6 Apr 2004 17:55:35 -0000	1.750
+++ mplayer.c	14 Apr 2004 20:50:15 -0000	1.751
@@ -2467,6 +2467,10 @@
 
 #ifdef USE_EDL
  if( next_edl_record->next ) { // Are we (still?) doing EDL?
+  if ( !sh_video ) {
+    mp_msg( MSGT_CPLAYER, MSGL_ERR, "Cannot use edit list without video. EDL disabled.\n" );
+    next_edl_record->next = NULL;
+  } else {
    if( sh_video->pts >= next_edl_record->start_sec ) {
      if( next_edl_record->action == EDL_SKIP ) {
        osd_function = OSD_FFW;
@@ -2486,6 +2490,7 @@
        next_edl_record = next_edl_record->next;
      }
    }
+  }
  }
 #endif