[MPlayer-cvslog] CVS: main mplayer.c, 1.914, 1.915 mencoder.c, 1.344, 1.345

[Michael Niedermayer CVS]

CVS change done by Michael Niedermayer CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv23153

Modified Files:
	mplayer.c mencoder.c 
Log Message:
feed something (hopefully correct timestamps) into the video filter chain


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.914
retrieving revision 1.915
diff -u -r1.914 -r1.915
--- mplayer.c	18 Mar 2006 18:48:14 -0000	1.914
+++ mplayer.c	21 Mar 2006 23:09:52 -0000	1.915
@@ -2693,7 +2693,7 @@
 	// decode:
 	current_module="decode_video";
 //	printf("Decode! %p  %d  \n",start,in_size);
-	blit_frame=decode_video(sh_video,start,in_size,drop_frame);
+	blit_frame=decode_video(sh_video,start,in_size,drop_frame, MP_NOPTS_VALUE);
 	break;
     }
     vdecode_time=video_time_usage-vdecode_time;

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- mencoder.c	19 Mar 2006 17:28:13 -0000	1.344
+++ mencoder.c	21 Mar 2006 23:09:52 -0000	1.345
@@ -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