From patchwork Mon Jul 2 11:38:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Barsnick X-Patchwork-Id: 9566 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp3702484jad; Mon, 2 Jul 2018 04:38:15 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf5sZuMTFOKYAYYrPE1RssfTLBLESDjwfU7r5ic8stQe42N5bGxp5oGR6JGezCdvPEsdpsd X-Received: by 2002:a1c:5a08:: with SMTP id o8-v6mr7611696wmb.61.1530531494938; Mon, 02 Jul 2018 04:38:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530531494; cv=none; d=google.com; s=arc-20160816; b=qvu72uM5GDecSztbbq06JvWQsCtVlVx4dPi3IdA7eztG/0y5eIIlb/9ixB/TDiDE6O IqfF77/ItUX7vZQz27UUb/eOhvQ8e4PdvuPBsOL6sNHBNrmvSdlvmIgR8JOFXjkyF2Nt vhmAh4Mvx/shNaugzav+VY5IlD8asYmJibHT3sxjBmLtqKSf1k8se8rkHrzwHUd4Q+iB 0qYj+yct2uIe1BNQbAJ11ARG/OjDaNxWaEqZvx6npTiiTS1xNSDKwI3jOpfxK58ELN/n Qmn50zF7DfxibKtbEj9/fxD1FMQS6vOTUcrUOKLy9i8Cv2azx29CD8f+zQJiV2M50xjK 324A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:user-agent:content-disposition:mime-version :message-id:to:from:date:delivered-to:arc-authentication-results; bh=M9xfilv5wnqwJUWNi6PWoEnYC2N0jrv7ov00H2jgQh0=; b=hIdNxDGUFpHPNN75b6eaZVCabk0PTXcmIIXit2aeoygYwjDJ4Qw9EfHY3jYyQtUkA4 FIBKFXwESVOP62Wkj+hEaE6ae7/3GKC7GgyLGvyAfveTXdjD6vZcMQXaJ9YrYI7eSAQe r9ju/uAZBXmwpwDvAq0ru6Ugcqv7C2KKuDK/0ZOBp0cRBej7l178NFmseIIwaxEdSpXR Lij6Isokg4AMlZlVbRP8x3oI9AZG5MgHBBLRo1hnIbxFwHhKNYEXS6MNBMHmNBPf5H55 ockTg2yuR3X9YkdcxmO/9B6PL992o2X7Kd1G5W1/qTE/bfEMUu5jOTWTa/M5IGvtsMhM WNmQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m10-v6si10284343wrh.299.2018.07.02.04.38.13; Mon, 02 Jul 2018 04:38:14 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 88A3D68A173; Mon, 2 Jul 2018 14:38:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4674E689DE1 for ; Mon, 2 Jul 2018 14:38:02 +0300 (EEST) Received: from sunshine.barsnick.net ([79.223.48.69]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LsfrR-1gGG4z3B7Z-012HG4; Mon, 02 Jul 2018 13:38:04 +0200 Date: Mon, 2 Jul 2018 13:38:04 +0200 From: Moritz Barsnick To: FFmpeg development discussions and patches Message-ID: <20180702113804.GG8854@sunshine.barsnick.net> MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email 2.14.4 User-Agent: Mutt/1.10.0 (2018-05-17) X-Provags-ID: V03:K1:iKc4hQxI0vNK6o3eaBZ6oYB+ikunnSapO4cb4nIjP3hE3UMrfGv U89P5d2sP7Qs5JgfTuqGl4RnV7Oj5YPXeGmROTLk6frlRzrdBSa6SPKJn9K4KeMOJg4LPE8 Mnw9CPOTf9D9+fkHX4nEeby/8+cqq+KqhBMfURa2DFgmGHfK3mZtA6N8xpHf5HptTNGDrjP 1sldFitkHF6cAArPz79ig== X-UI-Out-Filterresults: notjunk:1; V01:K0:Qo/7E3E3lrk=:SJd1YWhik3SqzgG9Y2rOWx 3fkOUQdGFraqNxzfRRw9oaNiE/atT04zy/Xd5CHIMyq2wyULuyFNIxuGnhJ5AjBq/7vPh2P3b rPXLFuRnJ8IfkXxqG43U37MyDwhl/ZqsvIifMqBMHqYYR8mR26nLQG5q+NzcqgP29rzqZRaV6 MKM445gfEM4ZYQtP3s87NQ/bFno94wc3O7gELhneVeezHs6Ytoq9AS1sEmfHy3PsViZ9qS5Qt dgJx/h7eu2v9kVDobiEEcxD22S2s43YITfKlLtOUv54pPCMo+GktS63f3NmJuBGvqJo9P/1/I lkfBai6CwblWxvRdSrouyBnp1GY6A+XLQzm3/svIZLgdXiGnZDhKFe7QddBzpMA2d+sr39Cng wUVedd3nNIDJJeiirgVSPPKvwCH9D+0hxuBr8FoRQmGoirdPzg5cf85W5Rmx5KBZwgPKHLc5I m/itHPE71IhghVJN7EWUq4N22Mq34yx6Ke8CY9PmQL+EVBUS8go2cXmM3hWv6CMPKdjwgxzzY Yzi5JG1q3dD8WRyYcygF4q5ok5xXGp/lZnxxj4oZ12YJqueLBP8m2HpwrHVG4EyeISdHBOScc sBEaAo2n8zm8k+X0juPFnaW8KznirsvGiexUNBIKP/UL5lYKzSd5n3FF7pSUDPBmBo+p1PYzV wJJNB9ZXqyg/KHfMfaRhAdnM6arahASmDgN9dO/w00yosYn7P24QYP+3M0AzuTQJecs8RkqqL XZaWFlbWApJyNS2wOyBG91PSUYS2IbrbyBLQEt0S8kfiOOAxgQ4bxkfsEUk= Subject: [FFmpeg-devel] [PATCH] avformat/rtpenc_mpegts: copy metadata to mpegts sub-muxer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes #7293. Signed-off-by: Moritz Barsnick --- Implemented to the best of my little knowledge (by checking other metadata use cases). Feel free to correct. Perhaps a candidate for backporting to release/4.0 or release/*? --- libavformat/rtpenc_mpegts.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/rtpenc_mpegts.c b/libavformat/rtpenc_mpegts.c index 5f81e1a145..6e5614db2f 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)