[Mplayer-cvslog] CVS: main mencoder.c,1.96,1.97

[Michael Niedermayer]

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

Modified Files:
	mencoder.c 
Log Message:
libavcodec bitrate is in kbit now ...


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- mencoder.c	17 Mar 2002 17:09:04 -0000	1.96
+++ mencoder.c	18 Mar 2002 01:00:43 -0000	1.97
@@ -74,7 +74,7 @@
 /* video options */
 char *lavc_param_vcodec = NULL;
 int lavc_param_vbitrate = -1;
-int lavc_param_vrate_tolerance = 1024*1024*8;
+int lavc_param_vrate_tolerance = 1024*8;
 int lavc_param_vhq = 0; /* default is realtime encoding */
 int lavc_param_vme = 3;
 int lavc_param_vqscale = 0;
@@ -1089,10 +1089,10 @@
     lavc_venc_context.width = vo_w;
     lavc_venc_context.height = vo_h;
     if (lavc_param_vbitrate >= 0) /* != -1 */
-	lavc_venc_context.bit_rate = lavc_param_vbitrate;
+	lavc_venc_context.bit_rate = lavc_param_vbitrate*1000;
     else
 	lavc_venc_context.bit_rate = 800000; /* default */
-    lavc_venc_context.bit_rate_tolerance= lavc_param_vrate_tolerance;
+    lavc_venc_context.bit_rate_tolerance= lavc_param_vrate_tolerance*1000;
     lavc_venc_context.frame_rate = (float)(force_ofps?force_ofps:sh_video->fps) * FRAME_RATE_BASE;
     lavc_venc_context.qmin= lavc_param_vqmin;
     lavc_venc_context.qmax= lavc_param_vqmax;