changeset 5632:93c9df5225a7

2-pass qscale fixed
author arpi
date Mon, 15 Apr 2002 13:39:48 +0000
parents 6cc3c2466288
children b62460b1db74
files libmpcodecs/ve_lavc.c
diffstat 1 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/ve_lavc.c	Mon Apr 15 11:11:25 2002 +0000
+++ b/libmpcodecs/ve_lavc.c	Mon Apr 15 13:39:48 2002 +0000
@@ -153,7 +153,8 @@
 		    5) == -1){
 	    mp_msg(MSGT_MENCODER,MSGL_ERR,"2pass failed: filename=%s\n", passtmpfile);
 	    pass=0;
-	}
+	} else
+	    lavc_venc_context.flags|=CODEC_FLAG_QSCALE|CODEC_FLAG_TYPE; // VBR
 	break;
     }
 
@@ -199,13 +200,8 @@
     if(pass==2){ // handle 2-pass:
 	lavc_venc_context.flags|=CODEC_FLAG_QSCALE; // enable VBR
 	lavc_venc_context.quality=VbrControl_get_quant();
-#ifdef CODEC_FLAG_TYPE
-	lavc_venc_context.flags|=CODEC_FLAG_TYPE; // force keyframes
 	lavc_venc_context.key_frame=VbrControl_get_intra();
 	lavc_venc_context.gop_size=0x3fffffff;
-#else
-#error you should upgrade libavcodec... get latest CVS
-#endif
 	out_size = avcodec_encode_video(&lavc_venc_context, mux_v->buffer, mux_v->buffer_size,
 	    &lavc_venc_picture);
 	VbrControl_update_2pass_vbr_encoding(lavc_venc_context.mv_bits,