[MPlayer-cvslog] r22248 - trunk/mencoder.c
ods15
subversion at mplayerhq.hu
Sat Feb 17 17:31:00 CET 2007
Author: ods15
Date: Sat Feb 17 17:30:59 2007
New Revision: 22248
Modified:
trunk/mencoder.c
Log:
1000l fix for mencoder -hr-edl-seek with -ovc copy, waiting for keyframe
created infinite loop
Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c (original)
+++ trunk/mencoder.c Sat Feb 17 17:30:59 2007
@@ -1684,8 +1684,11 @@
a_pts = forward_audio(sh_video->pts - frame_data->frame_time + audio_delay, d_audio, mux_a);
if (done) {
- frame_data->already_read = 1;
- if (!framecopy || (sh_video->ds->flags & 1)) return 1;
+ // wait for keyframe in case of -ovc copy
+ if (!framecopy || (sh_video->ds->flags & 1)) {
+ frame_data->already_read = 1;
+ return 1;
+ }
}
if (sh_video->pts >= end_pts) done = 1;
More information about the MPlayer-cvslog
mailing list