summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authoruau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-06-14 20:20:28 +0000
committeruau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-06-14 20:20:28 +0000
commit900e74381f3834dc8d7d2ed3d6109f35f1a4a7e8 (patch)
treef1bc5b2305868085ba8edeb0743f670df0ddfbe2 /mplayer.c
parent67233233030d593dd4939f2eb167c0016c3e0b4f (diff)
downloadmpv-900e74381f3834dc8d7d2ed3d6109f35f1a4a7e8.tar.bz2
mpv-900e74381f3834dc8d7d2ed3d6109f35f1a4a7e8.tar.xz
When playing an audio only file use audio time instead of video time to
set EDL mark. Fixes a NULL pointer dereference. Problem noticed by Robert Henney, robh A rut org. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18714 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mplayer.c b/mplayer.c
index ed9f46faef..271b67e75c 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -4232,7 +4232,8 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
} break;
case MP_CMD_EDL_MARK:
if( edl_fd ) {
- float v = sh_video->pts;
+ float v = sh_video ? sh_video->pts :
+ playing_audio_pts(sh_audio, d_audio, audio_out);
fprintf( edl_fd, "%f %f %d\n", v-2, v, 0 );
}
break;