1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

In libx264 wrapper, fix side effect with has_b_frames, bframe_pyramid can be set

when bframe is not.
This commit is contained in:
Baptiste Coudurier 2011-04-23 12:41:11 -07:00
parent 2ef2496cd1
commit c225615bf2

View File

@ -366,7 +366,8 @@ static av_cold int X264_init(AVCodecContext *avctx)
x4->params.b_repeat_headers = 0; x4->params.b_repeat_headers = 0;
// update AVCodecContext with x264 parameters // update AVCodecContext with x264 parameters
avctx->has_b_frames = x4->params.i_bframe_pyramid ? 2 : !!x4->params.i_bframe; avctx->has_b_frames = x4->params.i_bframe ?
x4->params.i_bframe_pyramid ? 2 : 1 : 0;
avctx->bit_rate = x4->params.rc.i_bitrate*1000; avctx->bit_rate = x4->params.rc.i_bitrate*1000;
avctx->crf = x4->params.rc.f_rf_constant; avctx->crf = x4->params.rc.f_rf_constant;