From 2507b5dd674834be7261772996f47ae3b95cca69 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 4 Oct 2015 12:19:26 +0200 Subject: mpegvideo_enc: export vbv_delay in side data Deprecate AVCodecContext.vbv_delay --- libavcodec/mpegvideo_enc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'libavcodec/mpegvideo_enc.c') diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 9336051430..4e97f4d3ab 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1769,6 +1769,9 @@ vbv_retry: s->out_format == FMT_MPEG1 && 90000LL * (avctx->rc_buffer_size - 1) <= s->avctx->rc_max_rate * 0xFFFFLL) { + AVCPBProperties *props; + size_t props_size; + int vbv_delay, min_delay; double inbits = s->avctx->rc_max_rate * av_q2d(s->avctx->time_base); @@ -1795,7 +1798,17 @@ vbv_retry: s->vbv_delay_ptr[1] = vbv_delay >> 5; s->vbv_delay_ptr[2] &= 0x07; s->vbv_delay_ptr[2] |= vbv_delay << 3; + + props = av_cpb_properties_alloc(&props_size); + if (!props) + return AVERROR(ENOMEM); + props->vbv_delay = vbv_delay * 300; + +#if FF_API_VBV_DELAY +FF_DISABLE_DEPRECATION_WARNINGS avctx->vbv_delay = vbv_delay * 300; +FF_ENABLE_DEPRECATION_WARNINGS +#endif } s->total_bits += s->frame_bits; avctx->frame_bits = s->frame_bits; -- cgit v1.2.3