diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-17 13:31:21 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-17 13:31:21 +0100 |
| commit | f49264a1c5912ee2bc23e7a09ded1024a178cf04 (patch) | |
| tree | 8175c3e1c1f8a41ef936b5c8512d0817be72985b /libavcodec/libopenh264enc.c | |
| parent | dd6ee019ea828a2700e38366983ef343612021c6 (diff) | |
| parent | 11c9bd633f635f07a762be1ecd672de55daf4edc (diff) | |
| download | ffmpeg-f49264a1c5912ee2bc23e7a09ded1024a178cf04.tar.gz | |
Merge commit '11c9bd633f635f07a762be1ecd672de55daf4edc'
* commit '11c9bd633f635f07a762be1ecd672de55daf4edc':
libopenh264enc: export CPB props side data
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/libopenh264enc.c')
| -rw-r--r-- | libavcodec/libopenh264enc.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index d77ecc9a58..8f87645a67 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -108,6 +108,7 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) int err = AVERROR_UNKNOWN; int log_level; WelsTraceCallback callback_function; + AVCPBProperties *props; // Mingw GCC < 4.7 on x86_32 uses an incorrect/buggy ABI for the WelsGetCodecVersion // function (for functions returning larger structs), thus skip the check in those @@ -223,6 +224,14 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) memcpy(avctx->extradata, fbi.sLayerInfo[0].pBsBuf, size); } + props = ff_add_cpb_side_data(avctx); + if (!props) { + err = AVERROR(ENOMEM); + goto fail; + } + props->max_bitrate = param.iMaxBitrate; + props->avg_bitrate = param.iTargetBitrate; + return 0; fail: |