diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-21 23:09:52 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-21 23:09:52 +0000 |
| commit | 87323740ede2b6ac4eda035eaaee03a658c4e255 (patch) | |
| tree | 7cc7dfc3c14e67c68ce0c449969c6f09432849f3 /mencoder.c | |
| parent | a812e6fc3c6c154047a52d16a9bcdec410a02a2b (diff) | |
| download | mpv-87323740ede2b6ac4eda035eaaee03a658c4e255.tar.bz2 mpv-87323740ede2b6ac4eda035eaaee03a658c4e255.tar.xz | |
feed something (hopefully correct timestamps) into the video filter chain
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17911 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mencoder.c b/mencoder.c index fa3f2ab170..a2eff6be11 100644 --- a/mencoder.c +++ b/mencoder.c @@ -1321,7 +1321,7 @@ case VCODEC_FRAMENO: default: // decode_video will callback down to ve_*.c encoders, through the video filters blit_frame=decode_video(sh_video,frame_data.start,frame_data.in_size, - skip_flag>0 && (!sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) != CONTROL_TRUE)); + skip_flag>0 && (!sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) != CONTROL_TRUE), mux_v->timer); if (sh_video->vf_inited < 0) mencoder_exit(1, NULL); @@ -1739,7 +1739,7 @@ static int slowseek(float end_pts, demux_stream_t *d_video, demux_stream_t *d_au if (vfilter) { int softskip = (vfilter->control(vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) == CONTROL_TRUE); - decode_video(sh_video, frame_data->start, frame_data->in_size, !softskip); + decode_video(sh_video, frame_data->start, frame_data->in_size, !softskip, MP_NOPTS_VALUE); } #ifdef USE_EDL |