[Mplayer-cvslog] CVS: main mencoder.c,1.103,1.104

[Arpi of Ize]

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

Modified Files:
	mencoder.c 
Log Message:
2-pass lavc encoding fixed

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- mencoder.c	28 Mar 2002 23:45:33 -0000	1.103
+++ mencoder.c	29 Mar 2002 01:01:35 -0000	1.104
@@ -1219,7 +1219,7 @@
 
     switch(pass){
     case 1:
-	if (VbrControl_init_2pass_vbr_analysis(passtmpfile, lavc_param_vme) == -1)
+	if (VbrControl_init_2pass_vbr_analysis(passtmpfile, 5) == -1)
 	{
 	    printf("2pass failed: filename=%s\n", passtmpfile);
 	    pass_working = 0;
@@ -1230,15 +1230,17 @@
     case 2:
         if (VbrControl_init_2pass_vbr_encoding(passtmpfile,
 		    lavc_venc_context.bit_rate,
-		    lavc_venc_context.frame_rate,
+		    force_ofps?force_ofps:sh_video->fps,
 		    100, /* crispness */
-		    lavc_param_vme) == -1)
+		    5) == -1)
 	{
 	    printf("2pass failed: filename=%s\n", passtmpfile);
 	    pass_working = 0;
 	}
-	else
+	else {
 	    pass_working = 1;
+	    lavc_venc_context.flags |= CODEC_FLAG_QSCALE;
+	}
 	break;
     }