From patchwork Thu Aug 25 00:27:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 37462 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp26178pzh; Wed, 24 Aug 2022 17:27:47 -0700 (PDT) X-Google-Smtp-Source: AA6agR6vfGV1xPpPRdxxl3+aCfzc486EeMpeV7MQ224qwuqK0zoGux4ZD0QCk7cpwKYbLPkrl09L X-Received: by 2002:a17:907:75f9:b0:73d:6285:4c94 with SMTP id jz25-20020a17090775f900b0073d62854c94mr818236ejc.698.1661387267800; Wed, 24 Aug 2022 17:27:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661387267; cv=none; d=google.com; s=arc-20160816; b=kuqT9A88FO/fPfLaBmcjaUONv85v0AZHfJobkk0yuRer8CF/esVpQYyaqdE0xZRbC0 NOD+mZ9hDwEyNjSTx/tsINrCGPTa3PSZBbOUgb2Z7DaRdwwtOJKz5jUIpFhiKx/L45/0 cd+oYitm70JQVPTyP4Q1ddmaG2Ta9uLXYhIOWRwmX/cGSrZJi7LCS/dzOVeiUyUwfvX9 XPHiIXxFEGEiW23+xPA0X9FrnXbRKZrMAp6sFkIr1R/QfQaQ708s5PJbNEfbzmDk3BJH 2GmSk7RWvMbYEoPLIuHqT02slgKvBBgsuBK2oBA0ynorNmawLmGfTlWngo6eDspCvJ1P B7Qw== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=cqXmFiG2aEcDBWKugO/f8vIk5H9hVJvMJLo4L9ysQxo=; b=bb9yr7U4lcpRj65QNH1/erYyw41k9RjuA5AbmlxOQ73p+jnpsicADbEFqCW9bnGR/0 zDHFNNLP0pCtLvQcdygSuQedjj4nKm4Gz56gsV+xUB0Wdt1nUz8ONUXrTxv6dcrGE5cf kr/VWc6lgUfELTcchQ5gtS6yLeFmjix1EnddQHT1t/UhvAFxn7sSL872BtXR0bNGayIl na869n287RW25gno3l2y3vQxki4xIALac+82ouKkffaWUyuqnKqb0TxwXllnY1Z6ZsAM uCcSdFzdx1nnLPmycHGLCfapJSXAUFU0TT/jpDwMePDHLT2FvdCs0JQPbZLAPPVwlca/ 1TkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=YnFH4ldj; 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cf20-20020a170906b2d400b0073c1b04f592si2494096ejb.245.2022.08.24.17.27.46; Wed, 24 Aug 2022 17:27:47 -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; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=YnFH4ldj; 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 774FF68B988; Thu, 25 Aug 2022 03:27:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 932A568B92B for ; Thu, 25 Aug 2022 03:27:30 +0300 (EEST) Received: by mail-qk1-f181.google.com with SMTP id m5so14032127qkk.1 for ; Wed, 24 Aug 2022 17:27:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=lAlWDEqtYV5gIKzqoIXAvc9LgBo9MDfmFS20A2ONjTs=; b=YnFH4ldjnIj4JfTbQB4fMjNPVxSRKsUgE8QbdKLvU/r8zk2PAWHMQR7MOVulBB25hD o0DUlWh8FtwqkqqMSjKx+EGfxNuVdLWMLfXzgYGViMeE1aq+P4MUnXHqF6+bwatijYfV Uj2d9HX2Je0p+eRkZmlkSIllkeslqfvf+PsCCajNiMoOFEC+dfHcVAsX+agGzevggj91 9fchDRBd2bNB01g0cwxaROD1M9Xt3S8SN2pt8IXtqtmWzgGrDs6WXO0oKsH76bxbdFoH VzW+nKkHsKfrPeO5YAY5Nz0Hbnd2AF4aJphZq1qecUQuZPvbq89hzG8F8vFVypfSfbA+ Knnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=lAlWDEqtYV5gIKzqoIXAvc9LgBo9MDfmFS20A2ONjTs=; b=BF1q/YWmMtgE/PEKGEXdt44Qni5F4Ka5econ0o2DVT5rpUczbZF7+li+5wrNiTTRa/ UKoLWPxc0NgHRcNQAu4tG1fs59NNAtLxZL8CS/u5jBUrVI/LmA46bTqs9lrXX8RUnsq9 qysgIJOzhlEb4KQqtiUl4inXQVqKAYZ9Dnrd1ME1qYIKuuYB54JPUqB1yJLBnR6zJvht HIB0ADt5znJRDhJyBGcIRGJ8AXDtxLIA7tGztW/vXFcUraN4/Mtwr9vPCu1ELyvFh+Il JJpFAxwwcZ3yPGA3oJ6iqHE+B4xByMONRZUISWJ2lb59IXLBkwqQoZmtvISQ5N/UXC49 18fg== X-Gm-Message-State: ACgBeo16Aue1xgItwDl6dersJ+4bjtgZrRjFrTtrXnnh0VKm+Udc0bJG cy7ZggQaWTboBrGc4AlPc8fgvvCMgtjg X-Received: by 2002:a05:620a:e0a:b0:6bc:15e9:14fe with SMTP id y10-20020a05620a0e0a00b006bc15e914femr1406531qkm.86.1661387249085; Wed, 24 Aug 2022 17:27:29 -0700 (PDT) Received: from localhost.localdomain ([192.210.24.132]) by smtp.gmail.com with ESMTPSA id i22-20020a05620a405600b006bba9575621sm16521091qko.68.2022.08.24.17.27.28 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 Aug 2022 17:27:28 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Aug 2022 19:27:21 -0500 Message-Id: <20220825002722.79902-2-rcombs@rcombs.me> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220825002722.79902-1-rcombs@rcombs.me> References: <20220825002722.79902-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavf/metadata: support duplicate keys in ff_metadata_conv X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: xamJC9xfTGwj --- libavformat/metadata.c | 2 +- tests/ref/fate/cover-art-aiff-id3v2-remux | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/metadata.c b/libavformat/metadata.c index b9b6de7972..2a1ffc69e7 100644 --- a/libavformat/metadata.c +++ b/libavformat/metadata.c @@ -50,7 +50,7 @@ void ff_metadata_conv(AVDictionary **pm, const AVMetadataConv *d_conv, key = dc->native; break; } - av_dict_set(&dst, key, mtag->value, 0); + av_dict_set(&dst, key, mtag->value, AV_DICT_MULTIKEY | AV_DICT_DEDUP); } av_dict_free(pm); *pm = dst; diff --git a/tests/ref/fate/cover-art-aiff-id3v2-remux b/tests/ref/fate/cover-art-aiff-id3v2-remux index 3ca2855eb8..2eac5f8d9c 100644 --- a/tests/ref/fate/cover-art-aiff-id3v2-remux +++ b/tests/ref/fate/cover-art-aiff-id3v2-remux @@ -67,10 +67,10 @@ TAG:title=third TAG:comment=Conductor [/STREAM] [FORMAT] -TAG:artist=Мельница +TAG:title=Дороги TAG:RATING=0 TAG:album=Ангелофрения -TAG:title=Дороги +TAG:artist=Мельница TAG:tracktotal=11 TAG:totaltracks=11 TAG:genre=Folk