Mercurial > libavcodec.hg

comparison libx264.c @ 10435:f1d179ba9e7a libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update libx264.c for x264 API change Change behavior of b-pyramid option.
author darkshikari
date Mon, 19 Oct 2009 09:35:19 +0000
parents 9e43db5ad7ef
children 7ca185b4bc42
comparison
equal deleted inserted replaced
10434:276b3a342389 10435:f1d179ba9e7a
179 179
180 x4->params.i_bframe = avctx->max_b_frames; 180 x4->params.i_bframe = avctx->max_b_frames;
181 x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC; 181 x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
182 x4->params.i_bframe_adaptive = avctx->b_frame_strategy; 182 x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
183 x4->params.i_bframe_bias = avctx->bframebias; 183 x4->params.i_bframe_bias = avctx->bframebias;
184 x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID; 184 x4->params.i_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID ? X264_B_PYRAMID_NORMAL : X264_B_PYRAMID_NONE;
185 avctx->has_b_frames = avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames; 185 avctx->has_b_frames = avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames;
186 186
187 x4->params.i_keyint_min = avctx->keyint_min; 187 x4->params.i_keyint_min = avctx->keyint_min;
188 if (x4->params.i_keyint_min > x4->params.i_keyint_max) 188 if (x4->params.i_keyint_min > x4->params.i_keyint_max)
189 x4->params.i_keyint_min = x4->params.i_keyint_max; 189 x4->params.i_keyint_min = x4->params.i_keyint_max;