Mercurial > mplayer.hg
changeset 22230:d655ce625259
1000l fix for mencoder -hr-edl-seek with -ovc copy, waiting for keyframe
created infinite loop
author | ods15 |
---|---|
date | Sat, 17 Feb 2007 16:30:59 +0000 |
parents | 44c3544fd926 |
children | da19b4ccb83a |
files | mencoder.c |
diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mencoder.c Sat Feb 17 13:28:44 2007 +0000 +++ b/mencoder.c Sat Feb 17 16:30:59 2007 +0000 @@ -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;