summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-04-14 20:50:15 +0000
committerrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-04-14 20:50:15 +0000
commit6b19bea6e1a0fb0f0c9cb9f0d09e9da6727a0007 (patch)
tree273c7a862a5a0c9e2f0803f344d454f61ae68fef /mplayer.c
parentd7f873f4698904f1bbb8e0ce8f07e33cd7c5780c (diff)
downloadmpv-6b19bea6e1a0fb0f0c9cb9f0d09e9da6727a0007.tar.bz2
mpv-6b19bea6e1a0fb0f0c9cb9f0d09e9da6727a0007.tar.xz
Fix segfault if EDL is used without video
Based on a patch by adland git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12208 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/mplayer.c b/mplayer.c
index 7b67c26038..34e8cdac99 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2467,6 +2467,10 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
#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 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
next_edl_record = next_edl_record->next;
}
}
+ }
}
#endif