From 44ffcada5d0c8ba1f06f4c918865526fb0216ad5 Mon Sep 17 00:00:00 2001 From: michael Date: Mon, 22 Apr 2002 02:00:23 +0000 Subject: =?UTF-8?q?hq=20mode=20in=20first=20pass=20should=20work=20(as=20b?= =?UTF-8?q?ad,=20ehh=20as=20well=20as=20LQ)=20apllied=20small=20part=20of?= =?UTF-8?q?=20patch=20by=20R=C3=A9mi=20Guyomarch=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5782 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ve_lavc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'libmpcodecs/ve_lavc.c') diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index a4731a652a..c6c89a45c1 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -142,6 +142,12 @@ static int config(struct vf_instance_s* vf, 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 @@ static int config(struct vf_instance_s* vf, 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, -- cgit v1.2.3