From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 12 Dec 2013 17:41:39 +0000 (+0100)
Subject: avformat/hlsenc: copy metadata
X-Git-Tag: android-x86-6.0-r1~8366
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d780fdb904a4a3f555252fad6b898534c9af128b;p=android-x86%2Fexternal-ffmpeg.git

avformat/hlsenc: copy metadata

Fixes Ticket2296

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index b9bf60543f..3b50397010 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -70,6 +70,7 @@ static int hls_mux_init(AVFormatContext *s)
 
     oc->oformat            = hls->oformat;
     oc->interrupt_callback = s->interrupt_callback;
+    av_dict_copy(&oc->metadata, s->metadata, 0);
 
     for (i = 0; i < s->nb_streams; i++) {
         AVStream *st;