[Mplayer-cvslog] CVS: main mencoder.c,1.186,1.187

[Arpi of Ize]

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

Modified Files:
	mencoder.c 
Log Message:
fixed -fps with mencoder and fixed-rate files (avi etc)
patch by Ivan Szanto <szivan at duticai.TWI.TUDelft.NL>


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- mencoder.c	4 Dec 2002 23:34:29 -0000	1.186
+++ mencoder.c	4 Dec 2002 23:37:17 -0000	1.187
@@ -500,6 +500,12 @@
    sh_video->fps,sh_video->frametime
   );
 
+  if(force_fps){
+    sh_video->fps=force_fps;
+    sh_video->frametime=1.0f/sh_video->fps;
+    mp_msg(MSGT_MENCODER,MSGL_INFO,"input fps will be interpreted as %5.2f instead\n", sh_video->fps);
+  }
+
   if(sh_audio && out_audio_codec<0){
     mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_NoAudioEncoderSelected);
     mencoder_exit(1,NULL);