comparison x264.c @ 3653:4a78757f28bc libavcodec

fix b pyramid in mp4 muxing if no dts are provided to the muxer
author michael
date Wed, 30 Aug 2006 21:18:17 +0000
parents 7dc6dcbc6960
children c8c591fe26f8
comparison
equal deleted inserted replaced
3652:d170a32e985c 3653:4a78757f28bc
158 x4->params.i_bframe = avctx->max_b_frames; 158 x4->params.i_bframe = avctx->max_b_frames;
159 x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC; 159 x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
160 x4->params.b_bframe_adaptive = avctx->b_frame_strategy; 160 x4->params.b_bframe_adaptive = avctx->b_frame_strategy;
161 x4->params.i_bframe_bias = avctx->bframebias; 161 x4->params.i_bframe_bias = avctx->bframebias;
162 x4->params.b_bframe_pyramid = (avctx->flags2 & CODEC_FLAG2_BPYRAMID); 162 x4->params.b_bframe_pyramid = (avctx->flags2 & CODEC_FLAG2_BPYRAMID);
163 avctx->has_b_frames= (avctx->flags2 & CODEC_FLAG2_BPYRAMID) ? 2 : !!avctx->max_b_frames;
163 164
164 x4->params.i_keyint_min = avctx->keyint_min; 165 x4->params.i_keyint_min = avctx->keyint_min;
165 if(x4->params.i_keyint_min > x4->params.i_keyint_max) 166 if(x4->params.i_keyint_min > x4->params.i_keyint_max)
166 x4->params.i_keyint_min = x4->params.i_keyint_max; 167 x4->params.i_keyint_min = x4->params.i_keyint_max;
167 168