Mercurial > mplayer.hg
changeset 19125:9b4f87f86bec
sync to x264 r537 (api change)
| author | lorenm |
|---|---|
| date | Tue, 18 Jul 2006 01:28:56 +0000 |
| parents | c23bd9485604 |
| children | efdf0045e7bc |
| files | configure libmpcodecs/ve_x264.c |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Mon Jul 17 22:22:34 2006 +0000 +++ b/configure Tue Jul 18 01:28:56 2006 +0000 @@ -6521,7 +6521,7 @@ cat > $TMPC << EOF #include <inttypes.h> #include <x264.h> -#if X264_BUILD < 46 +#if X264_BUILD < 48 #error We do not support old versions of x264. Get the latest from SVN. #endif int main(void) { x264_encoder_open((void*)0); return 0; }
--- a/libmpcodecs/ve_x264.c Mon Jul 17 22:22:34 2006 +0000 +++ b/libmpcodecs/ve_x264.c Tue Jul 18 01:28:56 2006 +0000 @@ -247,7 +247,10 @@ 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 @@ "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;