From patchwork Sun Jan 29 21:33:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40170 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp2967034pzj; Sun, 29 Jan 2023 13:35:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXu1VLajkL1xDjQkM36ScynKubW18+kJ4aJCmNG4ahoNTwgmhrOCfhqh+Q9btmDU8oyxwN8p X-Received: by 2002:a05:6402:3214:b0:496:37c9:b8e6 with SMTP id g20-20020a056402321400b0049637c9b8e6mr57097745eda.8.1675028109325; Sun, 29 Jan 2023 13:35:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675028109; cv=none; d=google.com; s=arc-20160816; b=xLu77Hbd5jrKijI9p8d5akoeGCnCu/TZe7aqIkTFYnTscxADUeEQu1USNZn3XJd2sg 4hU0b918SE+Xy3oZ2FLzPOwarzQASluPtnDo2J1TMpRw6/gVgX+4AmnWDLhzwvEbqhCM IqtngjBklXYK3F/s4dctib19gM/mglnZKuUtZOrl5lG3nVPFhUIwqGnZkZxfu6pLez07 pZGwGridUbUqXH9Tk9b8QcGoSWAmnS9CTGcc6gry8hZonGtYb1L9pf2s+hdfBwWKvkad rDaFRdnG8Ryjv3bCVW4NP1JkQ25vGqURQ+oDwQQzZxEsI4hY/MolHX/StZM9hRx7X4jC 0jAQ== 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:message-id:date:to:from :delivered-to; bh=2vRX+pEfcjjUyyqanssi3kgXx0+xSkepMjmz9kpXVVE=; b=oUhFvRNc40kXkLCDAwa+Fj/93UjLh1FM2L88YA7e1tam7WHA2JF7MQHWEUuLsQb70T LguIn68vs4pjnwyD/Mu+JToYwcrR3Y4py3D6Q/qFAhIQq9o2fFbvoCsCXHT7Boc//mUW ODKZolpraREpjMiTwNugw92HzdWM9oh7KtjQm5HsY3YZ98zkgYZfRGLRKqxmyp3gCNJV Dg6KO3csE7Xt5RSJscjL0XuHnIOXA4lM9biF1xh0ZA93PbWpQNmY7xeKk8Jw5b633lHB T2RIG6gC6OkyUy1XuudDYGi5wxMV8WGDAmuEi22P/IKkyl7lLs8q09cIGYYYiDKwWJd1 NHTA== 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 y12-20020a056402270c00b00493969bd008si16087925edd.121.2023.01.29.13.35.01; Sun, 29 Jan 2023 13:35:09 -0800 (PST) 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 0B31C68BC8C; Sun, 29 Jan 2023 23:34:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A486668B3DD for ; Sun, 29 Jan 2023 23:34:40 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 6A9B62404EC for ; Sun, 29 Jan 2023 22:34:40 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id zASpke7TOrkK for ; Sun, 29 Jan 2023 22:34:38 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 8D7EA240178 for ; Sun, 29 Jan 2023 22:34:38 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id E98273A02AF for ; Sun, 29 Jan 2023 22:34:30 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Jan 2023 22:33:51 +0100 Message-Id: <20230129213353.9351-1-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavu/opt: use AV_DICT_MULTIKEY in av_opt_set_dict2() 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: GSNAc0oMjPyN If the dictionary provided on input contains multiple entries for an option (relevant for flags modifying the previous value with '+' or '-') and the option is not found in the target object, only the last entry would be returned to the caller. Pass AV_DICT_MULTIKEY to av_dict_set() to make sure all such entries are returned. --- libavutil/opt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 0a909a8b22..0908751752 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -1752,7 +1752,7 @@ int av_opt_set_dict2(void *obj, AVDictionary **options, int search_flags) while ((t = av_dict_iterate(*options, t))) { ret = av_opt_set(obj, t->key, t->value, search_flags); if (ret == AVERROR_OPTION_NOT_FOUND) - ret = av_dict_set(&tmp, t->key, t->value, 0); + ret = av_dict_set(&tmp, t->key, t->value, AV_DICT_MULTIKEY); if (ret < 0) { av_log(obj, AV_LOG_ERROR, "Error setting option %s to value %s.\n", t->key, t->value); av_dict_free(&tmp);