[SCM] libav/experimental: lavc: properly handle subtitle_header in avcodec_copy_context()

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 3b2fbe67bd63b00331db2a9b213f6d420418a312
Author: Anton Khirnov <anton at khirnov.net>
Date:   Sat Apr 5 07:40:49 2014 +0200

    lavc: properly handle subtitle_header in avcodec_copy_context()

diff --git a/libavcodec/options.c b/libavcodec/options.c
index c28cbeb..85c1bec 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -162,6 +162,7 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
     dest->intra_matrix    = NULL;
     dest->inter_matrix    = NULL;
     dest->rc_override     = NULL;
+    dest->subtitle_header = NULL;
     if (src->rc_eq) {
         dest->rc_eq = av_strdup(src->rc_eq);
         if (!dest->rc_eq)
@@ -182,6 +183,8 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
     alloc_and_copy_or_fail(intra_matrix, 64 * sizeof(int16_t), 0);
     alloc_and_copy_or_fail(inter_matrix, 64 * sizeof(int16_t), 0);
     alloc_and_copy_or_fail(rc_override,  src->rc_override_count * sizeof(*src->rc_override), 0);
+    alloc_and_copy_or_fail(subtitle_header, src->subtitle_header_size, 0);
+    dest->subtitle_header_size = src->subtitle_header_size;
 #undef alloc_and_copy_or_fail
 
     return 0;

-- 
Libav/FFmpeg packaging