From 60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 14 Mar 2014 04:26:24 +0100 Subject: libx265: Write global extradata when requested Matroska, MP4, and other containers require it. Signed-off-by: Michael Niedermayer Signed-off-by: Derek Buitenhuis Signed-off-by: Luca Barbato --- libavcodec/libx265.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'libavcodec/libx265.c') diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index a6e4193f7f..b779c373c5 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -190,7 +190,7 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) for (i = 0; i < nnal; i++) ctx->header_size += nal[i].sizeBytes; - ctx->header = av_malloc(ctx->header_size); + ctx->header = av_malloc(ctx->header_size + FF_INPUT_BUFFER_PADDING_SIZE); if (!ctx->header) { av_log(avctx, AV_LOG_ERROR, "Cannot allocate HEVC header of size %d.\n", ctx->header_size); @@ -204,6 +204,14 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) buf += nal[i].sizeBytes; } + if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) { + avctx->extradata_size = ctx->header_size; + avctx->extradata = ctx->header; + + ctx->header_size = 0; + ctx->header = NULL; + } + return 0; } -- cgit v1.2.3