diff options
| author | lorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-18 01:28:56 +0000 |
|---|---|---|
| committer | lorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-18 01:28:56 +0000 |
| commit | e08fe8174f924db916a738cf440352855f85b511 (patch) | |
| tree | fac79b9230145f0d662e6e69db23de459bdc7148 /libmpcodecs | |
| parent | eb05b22b019c32121dc624c3ecd23b9b1a74749e (diff) | |
| download | mpv-e08fe8174f924db916a738cf440352855f85b511.tar.bz2 mpv-e08fe8174f924db916a738cf440352855f85b511.tar.xz | |
sync to x264 r537 (api change)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19130 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ve_x264.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c index 4c0d45d8c7..e57ddd5356 100644 --- a/libmpcodecs/ve_x264.c +++ b/libmpcodecs/ve_x264.c @@ -247,7 +247,10 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width, mod->param.i_deblocking_filter_beta = deblockbeta; mod->param.b_cabac = cabac; + mod->param.rc.i_rc_method = X264_RC_CQP; mod->param.rc.i_qp_constant = qp_constant; + if(rf_constant > 0) + mod->param.rc.i_rc_method = X264_RC_CRF; mod->param.rc.i_rf_constant = rf_constant; if(qp_min > qp_constant) qp_min = qp_constant; @@ -275,7 +278,7 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width, "VBV requires both vbv_maxrate and vbv_bufsize.\n"); return 0; } - mod->param.rc.b_cbr = 1; + mod->param.rc.i_rc_method = X264_RC_ABR; mod->param.rc.i_bitrate = bitrate; mod->param.rc.f_rate_tolerance = ratetol; mod->param.rc.i_vbv_max_bitrate = vbv_maxrate; |