[SCM] libav/experimental: libx265: Write global extradata when requested

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Fri Mar 14 04:26:24 2014 +0100

    libx265: Write global extradata when requested
    
    Matroska, MP4, and other containers require it.
    
    Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
    Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
    Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
index a6e4193..b779c37 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;
 }
 

-- 
Libav/FFmpeg packaging