[FFmpeg-cvslog] avformat/rtpenc_mpegts: copy metadata to mpegts sub-muxer

[Moritz Barsnick]

ffmpeg | branch: master | Moritz Barsnick <barsnick at gmx.net> | Mon Jul  2 13:38:04 2018 +0200| [270f94e132b623bd6717515b3a72c5f1c535190b] | committer: Michael Niedermayer

avformat/rtpenc_mpegts: copy metadata to mpegts sub-muxer

Fixes #7293.

Signed-off-by: Moritz Barsnick <barsnick at gmx.net>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=270f94e132b623bd6717515b3a72c5f1c535190b
---

 libavformat/rtpenc_mpegts.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/rtpenc_mpegts.c b/libavformat/rtpenc_mpegts.c
index 969dbff3d6..45ba6fffe5 100644
--- a/libavformat/rtpenc_mpegts.c
+++ b/libavformat/rtpenc_mpegts.c
@@ -60,6 +60,7 @@ static int rtp_mpegts_write_header(AVFormatContext *s)
         return AVERROR(ENOMEM);
     mpegts_ctx->oformat   = mpegts_format;
     mpegts_ctx->max_delay = s->max_delay;
+    av_dict_copy(&mpegts_ctx->metadata, s->metadata, 0);
     for (i = 0; i < s->nb_streams; i++) {
         AVStream* st = avformat_new_stream(mpegts_ctx, NULL);
         if (!st)
@@ -102,6 +103,7 @@ static int rtp_mpegts_write_header(AVFormatContext *s)
 fail:
     if (mpegts_ctx) {
         ffio_free_dyn_buf(&mpegts_ctx->pb);
+        av_dict_free(&mpegts_ctx->metadata);
         avformat_free_context(mpegts_ctx);
     }
     if (rtp_ctx)