diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-18 14:53:19 +0100 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-18 14:53:19 +0100 |
commit | 06d69a2d225ae0db433b62f0fa537b06e29b0db5 (patch) | |
tree | 367855f79370e79a42ff44d6238ab3ba3f1c4fc9 | |
parent | 3564dfd535743ad586c10800c7f931e5bf3cbde7 (diff) | |
parent | 458e53f51fc75d08df884f8e9eb3d7ded23e97b3 (diff) | |
download | ffmpeg-06d69a2d225ae0db433b62f0fa537b06e29b0db5.tar.gz |
Merge commit '458e53f51fc75d08df884f8e9eb3d7ded23e97b3'
* commit '458e53f51fc75d08df884f8e9eb3d7ded23e97b3':
mpegvideo_enc: actually add the side data with vbv_delay to the packet
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
-rw-r--r-- | libavcodec/mpegvideo_enc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index a550685e4f..01604e5507 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1987,6 +1987,13 @@ FF_ENABLE_DEPRECATION_WARNINGS return AVERROR(ENOMEM); props->vbv_delay = vbv_delay * 300; + ret = av_packet_add_side_data(pkt, AV_PKT_DATA_CPB_PROPERTIES, + (uint8_t*)props, props_size); + if (ret < 0) { + av_freep(&props); + return ret; + } + #if FF_API_VBV_DELAY FF_DISABLE_DEPRECATION_WARNINGS avctx->vbv_delay = vbv_delay * 300; |