comparison libx264.c @ 7868:850abcd10e19 libavcodec

sync to latest x264 git, field was renamed
author bcoudurier
date Tue, 16 Sep 2008 01:13:55 +0000
parents 38d356950bf4
children 47f50599b368
comparison
equal deleted inserted replaced
7867:2a611af7bcbe 7868:850abcd10e19
160 // we do it this way because we cannot check if the bitrate has been set 160 // we do it this way because we cannot check if the bitrate has been set
161 if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.i_rc_method = X264_RC_ABR; 161 if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.i_rc_method = X264_RC_ABR;
162 162
163 x4->params.i_bframe = avctx->max_b_frames; 163 x4->params.i_bframe = avctx->max_b_frames;
164 x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC; 164 x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
165 x4->params.b_bframe_adaptive = avctx->b_frame_strategy; 165 x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
166 x4->params.i_bframe_bias = avctx->bframebias; 166 x4->params.i_bframe_bias = avctx->bframebias;
167 x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID; 167 x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID;
168 avctx->has_b_frames= avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames; 168 avctx->has_b_frames= avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames;
169 169
170 x4->params.i_keyint_min = avctx->keyint_min; 170 x4->params.i_keyint_min = avctx->keyint_min;