diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2011-04-23 12:41:11 -0700 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2011-04-23 12:41:17 -0700 |
| commit | c225615bf2da206775c5ff2b56d648cf50d38756 (patch) | |
| tree | 42a858f05314474e7b1ef156b15cc14ee9284672 /libavcodec | |
| parent | 2ef2496cd19eb833f4ad22a5051c11be80d09598 (diff) | |
In libx264 wrapper, fix side effect with has_b_frames, bframe_pyramid can be set
when bframe is not.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libx264.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index acd13668d7..1b4e88b75b 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -366,7 +366,8 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->params.b_repeat_headers = 0; // 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->crf = x4->params.rc.f_rf_constant; |