From patchwork Wed Aug 24 23:51:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 37459 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp12304pzh; Wed, 24 Aug 2022 16:52:27 -0700 (PDT) X-Google-Smtp-Source: AA6agR7BexVvb6hXBW5RP7rcsBjb2QsnZGHBMVMvrUHrOcnWHCCa9qP2w0aK3Ip6v3G8uPRFFNVb X-Received: by 2002:a17:906:668b:b0:730:a5b7:8985 with SMTP id z11-20020a170906668b00b00730a5b78985mr760673ejo.548.1661385147489; Wed, 24 Aug 2022 16:52:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661385147; cv=none; d=google.com; s=arc-20160816; b=MujwFru9YonJaWlC405E5TAZON9pg66Jis4Dlcwbc4xT3nGYUomUcxtr734qd8qt1q CsJ66E6vna4hH9Zb6G9d3Lpyq15kkbnQ1PbXpzMghwjNlADoUnRK4LbEF89KcE61ZIqz HrmS6x0mqNlSPm24CaC9Kd4TnlwFUTYXUpFYk9PF0KA9jFOvekfMWXzHYKTbNQKBvtzz oj6TfiUpgqZS6Z5LuxJLOv/UJHG1Edcb74VB9enqO+cDECqOwcsnraN3Os9CRK4gwAW3 GT2HGz7NE1Y/cBEcem8ODEMKcvTwQpqlYammF0OhedEi13Cwy1N52XuTbLPZ0YR/+WvW ikZQ== 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=Bs9e7rjAuCOsTGL6UBovJN5Q2f445iECzUSX5a9D/Ocg5J+gIDpYYfnhSpaH2Szogg qrBBICD7GvuaGGTO91Gumd9j7VWOj/0GDszW7hLH8wS2+/j9/jRCCa8ioNJIHt4MgmP4 xMHyy0/oNJN0i/jP5YhFwfHrglUN8ug9vvsh9OeDnJyPNY3VZ06W9Vmb08SlY0REAxno 1E5OI3AlxVSzaB/gqUym5D3XgfcFtbcxJAbN/gcbz7LcmqAa0vVYeX7inBvMAE3iMMsd 4Jep+fyR/5YYKwZzgIq+BoiUWC+8R6vrgU6XqkQ8Zs8TlVp4wKdtNBNNkJTeYiENngSU s1Og== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=mkQGQaBu; 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 w8-20020a1709060a0800b0073d7353d1ffsi2858489ejf.860.2022.08.24.16.52.27; Wed, 24 Aug 2022 16:52:27 -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=mkQGQaBu; 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 60A8A68B988; Thu, 25 Aug 2022 02:52:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C7B068B737 for ; Thu, 25 Aug 2022 02:52:07 +0300 (EEST) Received: by mail-qk1-f173.google.com with SMTP id i7so13969663qka.13 for ; Wed, 24 Aug 2022 16:52:07 -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=mkQGQaBu3V0ohUR94wxERt1IQWWCRbzhVxahYmtnwLMhV3ysa2Qk1WB16UacNFTJco u9Jvw4PlNp/cIQnXXIRyCbPjYHDLCVSxq7/uh3Xk5qqHARvjy0ttnLSN0WdtTzRxQs5W 0+x9Hj+LLcjOUKAXkIm2TnxdKorUQEMO/ZSZLrOzYs3fx+KspcgL52AfM3c+7kngpN2/ KODW6/nUqU3yhHYpGWQU2q1AvutK1M4HK0jkKTnsM+sTZpriDPENilGRWK3T3hWQxlhn c75fl5pa2SRCIvQEmgzWj2G9cF4V3156Q3fRnQUpL4wABSB49Bva8TOVN5au1Bp7GUt/ obYg== 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=6r72b5irukErbGDMwHjxFTHAuWbUXcJhsauJv4EYoJa/xfOXjvnatkvW84zPUylTeh wVq2+fUb5ohm7EWMttBZ6iLhZxuuDL767CLVroOcEx1/ctWxZUokeR+N95cxaFv2I64o JGe8zXkbhNqcweFa94wxMg12qYuueCYzy3W7EVZN4zlDztonUlFupFbn7S27WIc9Hdbo PpEHM2XnteVcobNzpB8sOxXcGEadhSG9WblmmDNIAK4I203dExZ3eUGWrg6PK+KgQzkw DMsLS1IIJpim0pg0iJuipIyKQbOZVkyJ2LX8ICYnbxSEAOXcSi6WPCIVnEinxiB0sUYz OR+w== X-Gm-Message-State: ACgBeo2Ednf12IjEIYE+mP1zzbpZm3PyZSkvwpYSfdvAU0gpJFfu+led NxPiKB2xn740oOjB7jPcpyxZQxdFmE/l X-Received: by 2002:a05:620a:4711:b0:6bb:7e1b:5f0b with SMTP id bs17-20020a05620a471100b006bb7e1b5f0bmr1257521qkb.127.1661385125528; Wed, 24 Aug 2022 16:52:05 -0700 (PDT) Received: from localhost.localdomain ([192.210.24.132]) by smtp.gmail.com with ESMTPSA id q15-20020ac8450f000000b003447ee0a6bfsm13292065qtn.17.2022.08.24.16.52.04 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 Aug 2022 16:52:04 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Aug 2022 18:51:59 -0500 Message-Id: <20220824235200.22312-2-rcombs@rcombs.me> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220824235200.22312-1-rcombs@rcombs.me> References: <20220824235200.22312-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: myA5OTg3PTAE --- 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