From patchwork Mon May 6 15:27:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 48589 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:e68f:b0:1af:836d:81b3 with SMTP id mz15csp1445889pzb; Mon, 6 May 2024 08:28:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV6YR9xu5aMfoc5wJVtzNsxkU2vy8XlDCstYUZuGh64/WLFBNK6sebZHUEu9YMHs4yuiWyGgYpxgp9yuvPe32dmthj4P+aPlVwoCw== X-Google-Smtp-Source: AGHT+IH1q1kYS86ZQi0gqJ8yP9Chqp/iXoH/WZ7F42oC0yCj47DQ6Q+dNfHHO6AT2ZxVUSHn90ni X-Received: by 2002:a17:906:ccd6:b0:a59:a9c0:57ed with SMTP id ot22-20020a170906ccd600b00a59a9c057edmr4368161ejb.68.1715009278412; Mon, 06 May 2024 08:27:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715009278; cv=none; d=google.com; s=arc-20160816; b=gJ7HmlToT5+sseA3XaQ8XUOBsSF+kyOpiSXhCLSZzYdAzDndpW0NWt6+rFwPTD/0PR kxYNkT+m075Uc7NglJxXuGeVAwivTE6yvDYxR6lKGt6LQi7QNnYryuJLD7d/njB92WFp mFhHgmoRM9AhDjSHmcIUvCdmhjKRYZTH4GG5sKXtfP056+ZgL52ZJrIl9aMUGuibcDSI EujqrT747PPmKn/wHuw84XZDPn023V/3xO4+FyzA4QIBf8+4bzgV/49IUuBE8BYVnU8N cT52IZSzluH+9i6FlrZ+nOtQ6ii6oZDnd1fpM3myn0UvrtOAOf4tlp5lathpbmhGJmeA rlig== 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=ZZWWDJbjy+beyacHPBn02D075dc6w9LfTBlltB8gVYM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=aNlzyro8/n78eju2/fOfwQFIZja3sVb8Vu7iZe5ZvZlcbwzCf1RBRUDXt1CJ7p4cn3 M0iUUeAwW9X3OAiMc4l+rwt9o5nu/y1rJUVeko7BxGaVVDuITRGlxLQ/hTVGOK7yZ2Ui aS6dqCW8IDjj4zGQXYNk6eTO63rDb5aoSQcglpVUTsDgY1Xlw6jllatBWdhqWutpoiNR Cf3aqK8PVpm4etRDOvmO9pf6oDjCe4F6Opl3QrlqKb5ijyfgjsk3W843/iz404JsFSEb z1yxgTb8hcvU0gTo8p6zBvl5TnU8Fp8e9JbK63xkrZnYI7KRUnT9bYPcXmoKYuoa3lcB d3zA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="WO/tUU5L"; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k14-20020a1709063e0e00b00a599fc6e3d8si3269223eji.659.2024.05.06.08.27.57; Mon, 06 May 2024 08:27:58 -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=@gmail.com header.s=20230601 header.b="WO/tUU5L"; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DAA0C68D63F; Mon, 6 May 2024 18:27:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9088568D645 for ; Mon, 6 May 2024 18:27:29 +0300 (EEST) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1ee38966529so4415975ad.1 for ; Mon, 06 May 2024 08:27:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715009247; x=1715614047; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=E91n7aKZ0LqCmP1TellqGjCFte+iF3KPzm4Q2g7HaMs=; b=WO/tUU5Lbuvbq1sz6P/1KktnLkdTQaJ4zsnCCPHTr0pU12gUlx+/wkTd2yd8HPNvBO hytV95lLdwQDtvgN6CuZentXTG+wQrShEDJ/yQuFMe50IsdlIvzdeBY4OoO6mylvpgiJ 86Tr0lsTz4ngkhkOAofoGBQSixN9tysevGKncMZ1AbFLTF421Ms7hj1RBibFWxPZgd4r eUCrJkQ00tOimgfKhqHMutnUjCW6EJQbV7yLc8XjGJa41WRNAlG5wwJwsOcIpnlidrne mmLjbjRfG0NRbkvua6nxOVMsX4OSdEwgAHmswv+0sv3M2vM+OZMlgC7Nqp6bGWCb15eT TbcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715009247; x=1715614047; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E91n7aKZ0LqCmP1TellqGjCFte+iF3KPzm4Q2g7HaMs=; b=UmA222PM6XHOv7p/5nuiOz3K8idIKCykjRXjcMJQsfgGYXuz2chY1l3HjZKDlAJ4MU 3lYlaYF22UKAf6LL4vYPMTD02yLXjrtAl04ubnIGtnfUwtlcYIl7Fum7+Q/1vLLfa4Bp fjyat0aQEJkGDjIv1EqNdyWnd23ysi9CVnksu4mcQGt54xV9uYX5ma3REJsx1JsK2S61 davT5bGlPdIhiGdlc1sjMAsMlFyIJFW6DP+ZgU0Lgpcbet5kvJt9VvANC0klGlFLSokK 7G4O1LbkrNssaE7oSS9BfWs1sV2WtU7bqzh9y5/nPy3RNqnb6QWgEPv9WSN/7TYpBaIn 0ZIw== X-Gm-Message-State: AOJu0Yz8BMRhY8RrGFO8ufJQP2FEePbOY8poWDO8Wv/MRGxXUJ5KXLyL JXO/srzVv7pclPsClCRjQDHQredhsy/NlpFqRKoUCm2Y7KmGRmrG1ohM1g== X-Received: by 2002:a17:903:11cc:b0:1e7:e7ed:cbd8 with SMTP id q12-20020a17090311cc00b001e7e7edcbd8mr18278222plh.22.1715009247271; Mon, 06 May 2024 08:27:27 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id x10-20020a170902820a00b001e0da190a07sm8429684pln.167.2024.05.06.08.27.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 08:27:26 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 May 2024 12:27:04 -0300 Message-ID: <20240506152704.1596-3-jamrial@gmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240506152704.1596-1-jamrial@gmail.com> References: <20240506152704.1596-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avutil/opt: propagate av_dict_copy() errors in av_opt_{get, set}_dict_val() 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: jMYL66RpxJzx Signed-off-by: James Almer --- libavutil/opt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 60b0c2a946..23bc8c887c 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -934,9 +934,8 @@ int av_opt_set_dict_val(void *obj, const char *name, const AVDictionary *val, dst = (AVDictionary **)(((uint8_t *)target_obj) + o->offset); av_dict_free(dst); - av_dict_copy(dst, val, 0); - return 0; + return av_dict_copy(dst, val, 0); } int av_opt_set_chlayout(void *obj, const char *name, @@ -1348,9 +1347,8 @@ int av_opt_get_dict_val(void *obj, const char *name, int search_flags, AVDiction return AVERROR(EINVAL); src = *(AVDictionary **)(((uint8_t *)target_obj) + o->offset); - av_dict_copy(out_val, src, 0); - return 0; + return av_dict_copy(out_val, src, 0);; } int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name)