[MPlayer-cvslog] CVS: main mencoder.c,1.354,1.355

[Roberto Togni CVS]

CVS change done by Roberto Togni CVS

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

Modified Files:
	mencoder.c 
Log Message:
Temporary workaround for libavcodec issues with B-frames
This will be reverted after pre8 release

Patch written and approved by Michael Niedermayer


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- mencoder.c	28 Apr 2006 23:06:35 -0000	1.354
+++ mencoder.c	9 May 2006 20:06:34 -0000	1.355
@@ -1316,7 +1316,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), mux_v->timer);
+      skip_flag>0 && (!sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) != CONTROL_TRUE), MP_NOPTS_VALUE);
     
     if (sh_video->vf_inited < 0) mencoder_exit(1, NULL);