Mercurial > mplayer.hg

diff mencoder.c @ 17910:5ae29dc47c17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
feed something (hopefully correct timestamps) into the video filter chain
author michael
date Tue, 21 Mar 2006 23:09:52 +0000
parents 155fa4f8b32a
children 3fe3b2b3a6ce
line wrap: on
line diff
--- a/mencoder.c	Tue Mar 21 23:06:09 2006 +0000
+++ b/mencoder.c	Tue Mar 21 23:09:52 2006 +0000
@@ -1321,7 +1321,7 @@
 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 @@
 
         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