aboutsummaryrefslogtreecommitdiffhomepage
path: root/libmpcodecs
diff options
context:
space:
mode:
authorGravatar michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-22 02:00:23 +0000
committerGravatar michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-22 02:00:23 +0000
commit44ffcada5d0c8ba1f06f4c918865526fb0216ad5 (patch)
treeb4d0d65556d7ae5b445de4e482d617ea91b05e3a /libmpcodecs
parent0963631d139d8adf23156db4e9ac1bba1d9d41a8 (diff)
hq mode in first pass should work (as bad, ehh as well as LQ)
apllied small part of patch by RĂ©mi Guyomarch <rguyom@pobox.com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5782 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ve_lavc.c9
1 files changed, 7 insertions, 2 deletions
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,