diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-09-16 01:13:55 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-09-16 01:13:55 +0000 |
| commit | 0bc4c436aad4dd76fec58a6ce801a27b6039c481 (patch) | |
| tree | d6e59064de39453e1bad7d41c650320c7d853623 /libavcodec | |
| parent | bf3a971c1237307880337aac4da552652f368056 (diff) | |
| download | ffmpeg-0bc4c436aad4dd76fec58a6ce801a27b6039c481.tar.gz | |
sync to latest x264 git, field was renamed
Originally committed as revision 15337 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libx264.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |