[Mplayer-cvslog] CVS: main/libmpcodecs ve_lavc.c,1.11,1.12

[Michael Niedermayer]

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

Modified Files:
	ve_lavc.c 
Log Message:
hq mode in first pass should work (as bad, ehh as well as LQ) 
apllied small part of patch by Rémi Guyomarch <rguyom at pobox.com> 


Index: ve_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ve_lavc.c	21 Apr 2002 21:38:53 -0000	1.11
+++ ve_lavc.c	22 Apr 2002 02:00:23 -0000	1.12
@@ -142,6 +142,12 @@
     else
 	lavc_venc_context.flags = 0;
 
+     /* 4mv is currently buggy with B frames */
+    if (lavc_param_vmax_b_frames > 0 && lavc_param_v4mv) {
+        printf("4MV with B-Frames not yet supported -> 4MV disabled\n");
+        lavc_param_v4mv = 0;
+    }
+
     lavc_venc_context.flags|= lavc_param_v4mv ? CODEC_FLAG_4MV : 0;
 
     /* lavc internal 2pass bitrate control */
@@ -170,8 +176,7 @@
 	if (VbrControl_init_2pass_vbr_analysis(passtmpfile, 5) == -1){
 	    mp_msg(MSGT_MENCODER,MSGL_ERR,"2pass failed: filename=%s\n", passtmpfile);
 	    pass=0;
-	} else
-	    lavc_venc_context.flags &= ~CODEC_FLAG_HQ;
+	}
 	break;
     case 2:
         if (VbrControl_init_2pass_vbr_encoding(passtmpfile,