[Mplayer-cvslog] CVS: main mplayer.c,1.388,1.389

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv1366

Modified Files:
	mplayer.c 
Log Message:
setting vo_fps, required for vo_yuv4mpeg

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -r1.388 -r1.389
--- mplayer.c	9 Feb 2002 00:47:55 -0000	1.388
+++ mplayer.c	9 Feb 2002 01:29:11 -0000	1.389
@@ -1065,6 +1065,14 @@
 	   sh_video->fps,sh_video->frametime
 	   );
 
+    vo_fps = sh_video->fps;
+    /* need to set fps here for output encoders to pick it up in their init */
+    if(force_fps){
+      sh_video->fps=force_fps;
+      sh_video->frametime=1.0f/sh_video->fps;
+      vo_fps = force_fps;
+    }
+
     if(!sh_video->fps && !force_fps){
       mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_FPSnotspecified);
       sh_video=d_video->sh=NULL;
@@ -1476,7 +1484,7 @@
 
 if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf!
 if(force_fps){
-  sh_video->fps=force_fps;
+  vo_fps = sh_video->fps=force_fps;
   sh_video->frametime=1.0f/sh_video->fps;
   mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_FPSforced,sh_video->fps,sh_video->frametime);
 }