Due to being pants-on-head retarded, libavcodec defaults this to zero, which results in broken output. This didn't affect ffmpeg.c, which sets it itself, but caused problems for other calling apps using VBV. (cherry picked from commit f7f8120fb9a06b5d7fbf5add48a0d8464319a332)
Unified · Split
| @@ -277,12 +277,11 @@ static av_cold int X264_init(AVCodecContext *avctx) · 276 unmodified lines | |||
| 277 | if (avctx->level > 0) | 277 | if (avctx->level > 0) |
| 278 | x4->params.i_level_idc = avctx->level; | 278 | x4->params.i_level_idc = avctx->level; |
| 279 | 279 | ||
| 280 | if ((avctx->rc_buffer_size != 0) && | 280 | if (avctx->rc_buffer_size && avctx->rc_initial_buffer_occupancy && |
| 281 | (avctx->rc_initial_buffer_occupancy <= avctx->rc_buffer_size)) { | 281 | (avctx->rc_initial_buffer_occupancy <= avctx->rc_buffer_size)) { |
| 282 | x4->params.rc.f_vbv_buffer_init = | 282 | x4->params.rc.f_vbv_buffer_init = |
| 283 | (float)avctx->rc_initial_buffer_occupancy / avctx->rc_buffer_size; | 283 | (float)avctx->rc_initial_buffer_occupancy / avctx->rc_buffer_size; |
| 284 | } else | 284 | } |
| 285 | x4->params.rc.f_vbv_buffer_init = 0.9; | ||
| 286 | 285 | ||
| 287 | x4->params.rc.b_mb_tree = !!(avctx->flags2 & CODEC_FLAG2_MBTREE); | 286 | x4->params.rc.b_mb_tree = !!(avctx->flags2 & CODEC_FLAG2_MBTREE); |
| 288 | x4->params.rc.f_ip_factor = 1 / fabs(avctx->i_quant_factor); | 287 | x4->params.rc.f_ip_factor = 1 / fabs(avctx->i_quant_factor); |