Mercurial > mplayer.hg

comparison mencoder.c @ 22230:d655ce625259

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 b36abbbca01e
children d0b60d14d8d7
comparison
equal deleted inserted replaced
22229:44c3544fd926 22230:d655ce625259
1682 frame_data->already_read = 0; 1682 frame_data->already_read = 0;
1683 1683
1684 a_pts = forward_audio(sh_video->pts - frame_data->frame_time + audio_delay, d_audio, mux_a); 1684 a_pts = forward_audio(sh_video->pts - frame_data->frame_time + audio_delay, d_audio, mux_a);
1685 1685
1686 if (done) { 1686 if (done) {
1687 frame_data->already_read = 1; 1687 // wait for keyframe in case of -ovc copy
1688 if (!framecopy || (sh_video->ds->flags & 1)) return 1; 1688 if (!framecopy || (sh_video->ds->flags & 1)) {
1689 frame_data->already_read = 1;
1690 return 1;
1691 }
1689 } 1692 }
1690 if (sh_video->pts >= end_pts) done = 1; 1693 if (sh_video->pts >= end_pts) done = 1;
1691 1694
1692 if (vfilter) { 1695 if (vfilter) {
1693 int softskip = (vfilter->control(vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) == CONTROL_TRUE); 1696 int softskip = (vfilter->control(vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) == CONTROL_TRUE);