From patchwork Thu Sep 26 16:18:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51869 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b66f:0:b0:48e:c0f8:d0de with SMTP id o15csp504254vqw; Thu, 26 Sep 2024 09:22:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVprkcxa6b1xIrwCGinymjKW1kOLuir2YGWOWHOge9UlmEq4SB4u6a880jUbuL95RLr9oYEN6/EnhuyLBa7PeiO@gmail.com X-Google-Smtp-Source: AGHT+IG8lIR9OA69btYV4gdo+SNo9I1SAcLdXDBGvA2kzUJY/FvwA4+mk1I7aEju7TQRnzwzz09Y X-Received: by 2002:a05:6512:158f:b0:52c:e17c:cd7b with SMTP id 2adb3069b0e04-5389fc44ff1mr212890e87.22.1727367726804; Thu, 26 Sep 2024 09:22:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727367726; cv=none; d=google.com; s=arc-20240605; b=NqCovNRXePmaIawpXS3l7uYsXt5POfZ015ur5x9XWXHyX/pIllQRKAIy58KAHwVYlF WdWS4FmlnKVGlYj8O05a9SvdxE1Q0GOkB/YZbI8f5jLvEqfTdiTff3BWhhXJFNYUX2cf xMZsbAGV4Lhl0d4lOv8bEbmiV2FswYLoJOr6yz3W0joX8gR65gUv6D9IMQ9qN/1MgiQ6 Iq6yxGlrzrHzEU62X/SeQfcL/AplgfeL/RKDaK1Su7JrhijPZGzSgzCAFwGv7soFGCCo IUtv0kLUWj9Z1H/eSuSQgrUrnIsbdsLb6nQqI+7ZtTWj6zjcyIu+t1QKarTmoTRsfuFY VKYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=JYmY3Op82I5y/TZj1TwQUcU/oACTrJIyV3v6kBnERrE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=WtHjoAu9x9icl+3cfCiVA9xx7slhnj2XVYiLN4b76DQ00Ta5BYn4Ij/vhEjF4iebgM +Qunbc1sta3ypb0o987UTQLKwOoKMUi6a3iV7KuV4I+2YX/YnVyW1GQYbHojqxzgQ2vj GapPbLOFyHUgGijncOIu2kM3eat4gQS8R3y8Z5hB98IRcn6UbsmF+o6HTKancOTOCF80 TwwbWCqc3Cah9a66zVemlAeDa85Gxyjf8GbM8yn3++csCFOmpJyhiO29oOe/byZPQTlV XKt1rOgKzUryZb25/02Zv3hifPuoHQliUlncBj6fmJ+hsuWfngRjVoT/BqlRUB/LLZ1Y ZwvA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=YIN6ZYlr; 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 a640c23a62f3a-a93c29e4bc8si18199966b.511.2024.09.26.09.22.06; Thu, 26 Sep 2024 09:22:06 -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=@khirnov.net header.s=mail header.b=YIN6ZYlr; 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 1BC0C68DC6F; Thu, 26 Sep 2024 19:21:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A62D468DD3F for ; Thu, 26 Sep 2024 19:20:49 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=YIN6ZYlr; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 519194E05 for ; Thu, 26 Sep 2024 18:20:49 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id AqzJJVo3_VmY for ; Thu, 26 Sep 2024 18:20:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1727367647; bh=SXG59iIFtIaDnZkA4nsF6aNAU7sMG0t3fzbaH3zBoDw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=YIN6ZYlr5gzilImPgbj72eujKw5LvQtjxNYazDO+MFkbdkTuTeuNFHHJ1TYnvMtoO 2ZZSaR8hN7wg9tFtLhgcLEyxfTGFU30oDHUPJaUr+8UdT/j5FpCKW3x2Qdc3om3YXQ YwI53QKtoAjvSurhvcWFGl4KouaVzek9gnNRztRYW91hbbkAFNv+/9BcvNoFpY1lb4 qQnn7RCey2bepBquFlE5TRZ9CVqtlUueOZIiCwzquhnmw0dcx243RFMET51V+JJV5n DGaPvHkOB/1HiRMOtzsazFxjebwy4cQWFcM9Hsw2DFw3ATrRA6JV2yr9vsXby2tp7E x8BTvWhXi0oSw== 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 mail1.khirnov.net (Postfix) with ESMTPS id 817584DF1 for ; Thu, 26 Sep 2024 18:20:47 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 2FB013A0229 for ; Thu, 26 Sep 2024 18:20:41 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Sep 2024 18:18:55 +0200 Message-ID: <20240926161901.31421-1-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240925132921.11203-1-anton@khirnov.net> References: <20240925132921.11203-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/17] lavu/opt: add missing 'else' 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: TfAshkWnr2He --- libavutil/opt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 45db4f484f..02ed9d9fe9 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -2362,7 +2362,7 @@ int av_opt_set_array(void *obj, const char *name, int search_flags, ret = opt_set_elem(obj, target_obj, o, *(const char **)src, dst); if (ret < 0) goto fail; - } if (val_type == AV_OPT_TYPE_INT || + } else if (val_type == AV_OPT_TYPE_INT || val_type == AV_OPT_TYPE_INT64 || val_type == AV_OPT_TYPE_FLOAT || val_type == AV_OPT_TYPE_DOUBLE ||