From dded5ed9c5eb0c3d5a953e661ea21a9019e93ea4 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 14 Mar 2014 04:26:24 +0100 Subject: [PATCH] avcodec/libx265: fill headers in extradata Fixes Ticket3457 Signed-off-by: Michael Niedermayer --- libavcodec/libx265.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 698ade2168..2aceac796d 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,13 @@ 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; }