virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Code Issues Releases Activity

Merge commit '458e53f51fc75d08df884f8e9eb3d7ded23e97b3'

Browse Source 
* commit '458e53f51fc75d08df884f8e9eb3d7ded23e97b3':
  mpegvideo_enc: actually add the side data with vbv_delay to the packet

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-12-18 14:53:19 +01:00
commit 06d69a2d22
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/mpegvideo_enc.c
View File

@ -1987,6 +1987,13 @@ FF_ENABLE_DEPRECATION_WARNINGS
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
props->vbv_delay = vbv_delay * 300; 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 #if FF_API_VBV_DELAY
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
avctx->vbv_delay = vbv_delay * 300; avctx->vbv_delay = vbv_delay * 300;