[MPlayer-cvslog] r18714 - trunk/mplayer.c
uau
subversion at mplayerhq.hu
Wed Jun 14 22:20:28 CEST 2006
Author: uau
Date: Wed Jun 14 22:20:28 2006
New Revision: 18714
Modified:
trunk/mplayer.c
Log:
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.
Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c (original)
+++ trunk/mplayer.c Wed Jun 14 22:20:28 2006
@@ -4232,7 +4232,8 @@
} 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;
More information about the MPlayer-cvslog
mailing list