diff options
| author | ods15 <ods15@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-17 16:30:59 +0000 |
|---|---|---|
| committer | ods15 <ods15@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-17 16:30:59 +0000 |
| commit | 500ca8e2180914f541b4909e59d0461d827a0734 (patch) | |
| tree | 03e762c56fb6c78ebfe1d5b61e6cdb2d5d46fa3d /mencoder.c | |
| parent | 099c9b26f4a2d4feb35f6f782ab8ecebf15e934c (diff) | |
| download | mpv-500ca8e2180914f541b4909e59d0461d827a0734.tar.bz2 mpv-500ca8e2180914f541b4909e59d0461d827a0734.tar.xz | |
1000l fix for mencoder -hr-edl-seek with -ovc copy, waiting for keyframe
created infinite loop
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22248 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mencoder.c b/mencoder.c index 029a980fde..cadb079c95 100644 --- a/mencoder.c +++ b/mencoder.c @@ -1684,8 +1684,11 @@ static int slowseek(float end_pts, demux_stream_t *d_video, demux_stream_t *d_au 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; |