Mercurial > mplayer.hg

changeset 12207:3c148bdd86d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix segfault if EDL is used without video Based on a patch by adland
author rtognimp
date Wed, 14 Apr 2004 20:50:15 +0000
parents d572c605f665
children 31811f35f845
files mplayer.c
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Wed Apr 14 20:45:26 2004 +0000
+++ b/mplayer.c	Wed Apr 14 20:50:15 2004 +0000
@@ -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