From 0bc4c436aad4dd76fec58a6ce801a27b6039c481 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Tue, 16 Sep 2008 01:13:55 +0000 Subject: sync to latest x264 git, field was renamed Originally committed as revision 15337 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/libx264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/libx264.c') diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 266ab39d66..894e614844 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -162,7 +162,7 @@ X264_init(AVCodecContext *avctx) x4->params.i_bframe = avctx->max_b_frames; x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC; - x4->params.b_bframe_adaptive = avctx->b_frame_strategy; + x4->params.i_bframe_adaptive = avctx->b_frame_strategy; x4->params.i_bframe_bias = avctx->bframebias; x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID; avctx->has_b_frames= avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames; -- cgit v1.2.3