1 --- trunk/libavcodec/x264.c 2006/02/20 19:01:29 5040
2 +++ trunk/libavcodec/x264.c 2006/07/18 01:29:43 5780
4 x4->params.rc.b_stat_write = (avctx->flags & CODEC_FLAG_PASS1);
5 if(avctx->flags & CODEC_FLAG_PASS2) x4->params.rc.b_stat_read = 1;
7 - if(avctx->crf) x4->params.rc.i_rf_constant = avctx->crf;
8 - else if(avctx->cqp > -1) x4->params.rc.i_qp_constant = avctx->cqp;
10 + x4->params.rc.i_rc_method = X264_RC_CRF;
11 + x4->params.rc.f_rf_constant = avctx->crf;
12 + }else if(avctx->cqp > -1){
13 + x4->params.rc.i_rc_method = X264_RC_CQP;
14 + x4->params.rc.i_qp_constant = avctx->cqp;
18 // if neither crf nor cqp modes are selected we have to enable the RC
19 // we do it this way because we cannot check if the bitrate has been set
20 - if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.b_cbr = 1;
21 + if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.i_rc_method = X264_RC_ABR;
23 x4->params.i_bframe = avctx->max_b_frames;
24 x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;