Message ID | 20240223143115.16521-12-anton@khirnov.net |
---|---|
State | Accepted |
Commit | 1ffa657a0347b7f84dd737b8c91890ad26ac54f5 |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:26a3:b0:19e:cdac:8cce with SMTP id h35csp992589pze; Fri, 23 Feb 2024 06:32:30 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCW7biqH54+RtH5kXsKF6LQ58zNA3//JsFy0LFYdNV2dz3j+M3nnl0OEkKy79dD3HwKsqPDIbI2gjOVGWYpI4kowPpF3/AhVTwqciA== X-Google-Smtp-Source: AGHT+IFAHzyIjCtD60inTvqmJC/KE7IL9VYeqtReKgAvoWQl2MO/xXt1PnuqPibCbtHF5YcQQ5O6 X-Received: by 2002:aa7:ccd8:0:b0:565:1ee9:4f11 with SMTP id y24-20020aa7ccd8000000b005651ee94f11mr2371edt.15.1708698750269; Fri, 23 Feb 2024 06:32:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708698750; cv=none; d=google.com; s=arc-20160816; b=DsDengVDb7PNLpsi0dkpybG86nV+Vkc8WbT2uRW39w7M+oVXhKq2KeXHrznmo8PPcH zTAuSBOuAy6xkC4df4Df4StQkcP/AC8cypd17b94ExUKQlNMH1oc3VkVNNYUragLPrj2 yEx2d9duZdsmCndX39fHRIq1ttag7u5SzxaKk5lBwd++Q7VbG+5NY3Dln4HDS6XpytKV +lvfz+ATF9ujRocYfpFLaXlkCQJZ8EWEt1blWWHIJ1j+DVmfafxVtE0sGgGOLB3UaJL6 0ZiAX4/dDjIxmeFMX5pWcHyr9DYk6bKmU8nQDlEtdJH+WYB3Z4qawWuE8d7IMG1OsvDE 0yDA== 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=SQb6Ji5+ryqqZuoN8ECQ3WJHaCLjnSmHb1jiXV+Ha00=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Lollf/K4Grx1nVV933t5GsVQahycmBtrH9rZymq4Cx5nwVvtzhti47np4+aPosKByK 86JlhIGyuzeIetGW5tUSEiH8IxmxB+4ymTd0rO9pu1xcYWgYlv3aoBe3F9+pMVB1ilZp pW2I0PUtTq69ttQ1Ey1MyeMMUxiLTDwc2c6KYcGe1h6dWUuCX3KlKa5L5q+eWZ7rAWP6 KLXi+O2+SYconi/YioG8HGlH6bbeQ4ZeZI6hDkIisBfclJpWZ8wNiraQ442TWKNXhbAp 6bwcDIM0of6Czcld5jNmtt77xhB9+rGjcPl9hPSIvVudzDFAuCvPP9iAbB3K2FbsPdGY duHQ==; 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=WtkRP9h4; 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: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ba7-20020a0564021ac700b005633f37a2d1si6135290edb.365.2024.02.23.06.32.29; Fri, 23 Feb 2024 06:32:30 -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; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=WtkRP9h4; 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 A30DB68C8AE; Fri, 23 Feb 2024 16:31:43 +0200 (EET) 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 7F27C68C462 for <ffmpeg-devel@ffmpeg.org>; Fri, 23 Feb 2024 16:31:35 +0200 (EET) 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=WtkRP9h4; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 85B5E4D41 for <ffmpeg-devel@ffmpeg.org>; Fri, 23 Feb 2024 15:31:31 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id RevcTYfGMeer for <ffmpeg-devel@ffmpeg.org>; Fri, 23 Feb 2024 15:31:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1708698687; bh=R/LerEsMqvqJIj3p7go4Gg+JhHIm4bn7q6u/xO/wrfA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=WtkRP9h43fFYldjQ2KP7zGCI6efIHzgK1IS3/pwF+1ru0vNSc9nVAEkNbvalkw/9k aPUyLUtIM0wOXgtF1AXrOFQreVWskvK5AJ4uEKfTmf1G16y5t7r9lsAGwo4IDyyq4a RUho+q9+RfkSp8t7oCdn520lqWsAyHpS63vm0LPEHP8QwzQiZyD4wUYMVWYA4apBOO BbkfJYbGfNjj/uYdf1uCC6eN+R76iaRs8XgHqdxg8FqXhXx5iNGawggAXsSqnzpYxM D/3WB0bZUj2T+QxM6QbntVq6mWI30JYdzOw9hGq2vOutAon450XaNNLo8/DvtIGI+A qZxvRuPu3yJNg== 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 784A44D3C for <ffmpeg-devel@ffmpeg.org>; Fri, 23 Feb 2024 15:31:27 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 5285C3A1A74 for <ffmpeg-devel@ffmpeg.org>; Fri, 23 Feb 2024 15:31:22 +0100 (CET) From: Anton Khirnov <anton@khirnov.net> To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Feb 2024 14:58:33 +0100 Message-ID: <20240223143115.16521-12-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240223143115.16521-1-anton@khirnov.net> References: <20240223143115.16521-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/38] lavu/opt: simplify error handling in get_number() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: irG4vZREu7Yw |
Series |
[FFmpeg-devel,01/38] lavu/opt: cosmetics, change option flags to (1 << N) style
|
expand
|
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
diff --git a/libavutil/opt.c b/libavutil/opt.c index 54a99c689c..75a27c4d9b 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -961,16 +961,11 @@ static int get_number(void *obj, const char *name, double *num, int *den, int64_ void *dst, *target_obj; const AVOption *o = av_opt_find2(obj, name, NULL, 0, search_flags, &target_obj); if (!o || !target_obj) - goto error; + return AVERROR_OPTION_NOT_FOUND; dst = ((uint8_t *)target_obj) + o->offset; return read_number(o, dst, num, den, intnum); - -error: - *den = - *intnum = 0; - return -1; } int av_opt_get_int(void *obj, const char *name, int search_flags, int64_t *out_val)