[SCM] libav/experimental: sync to latest x264 git, field was renamed

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:30:13 UTC 2013


The following commit has been merged in the experimental branch:
commit 0bc4c436aad4dd76fec58a6ce801a27b6039c481
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Tue Sep 16 01:13:55 2008 +0000

    sync to latest x264 git, field was renamed
    
    Originally committed as revision 15337 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 266ab39..894e614 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;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list