Mercurial > libavcodec.hg

changeset 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 276b3a342389
children a050e8857f00
files libx264.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libx264.c	Sun Oct 18 21:44:03 2009 +0000
+++ b/libx264.c	Mon Oct 19 09:35:19 2009 +0000
@@ -181,7 +181,7 @@
     x4->params.b_cabac           = avctx->coder_type == FF_CODER_TYPE_AC;
     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;
+    x4->params.i_bframe_pyramid  = avctx->flags2 & CODEC_FLAG2_BPYRAMID ? X264_B_PYRAMID_NORMAL : X264_B_PYRAMID_NONE;
     avctx->has_b_frames          = avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames;
 
     x4->params.i_keyint_min = avctx->keyint_min;