diff options
| author | Loren Merritt <lorenm@u.washington.edu> | 2006-07-18 01:29:43 +0000 |
|---|---|---|
| committer | Loren Merritt <lorenm@u.washington.edu> | 2006-07-18 01:29:43 +0000 |
| commit | 8b75e45d8c1a84b39f19877c9248a20f23a78d98 (patch) | |
| tree | e74a7bf211c486466c495cec53cfcc86a680f833 | |
| parent | fd0fb3064d7dcdad03abd4ae5c2d9d1b184b6f2e (diff) | |
| download | ffmpeg-8b75e45d8c1a84b39f19877c9248a20f23a78d98.tar.gz | |
sync to x264 r537
Originally committed as revision 5780 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/x264.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libavcodec/x264.c b/libavcodec/x264.c index ddd29e7484..9be6a3eb97 100644 --- a/libavcodec/x264.c +++ b/libavcodec/x264.c @@ -142,13 +142,18 @@ X264_init(AVCodecContext *avctx) x4->params.rc.b_stat_write = (avctx->flags & CODEC_FLAG_PASS1); if(avctx->flags & CODEC_FLAG_PASS2) x4->params.rc.b_stat_read = 1; else{ - if(avctx->crf) x4->params.rc.i_rf_constant = avctx->crf; - else if(avctx->cqp > -1) x4->params.rc.i_qp_constant = avctx->cqp; + if(avctx->crf){ + x4->params.rc.i_rc_method = X264_RC_CRF; + x4->params.rc.i_rf_constant = avctx->crf; + }else if(avctx->cqp > -1){ + x4->params.rc.i_rc_method = X264_RC_CQP; + x4->params.rc.i_qp_constant = avctx->cqp; + } } // if neither crf nor cqp modes are selected we have to enable the RC // we do it this way because we cannot check if the bitrate has been set - if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.b_cbr = 1; + if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.i_rc_method = X264_RC_ABR; x4->params.i_bframe = avctx->max_b_frames; x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC; |