From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 0A55C48CF2 for ; Fri, 23 Feb 2024 14:31:59 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F212268C75C; Fri, 23 Feb 2024 16:31:38 +0200 (EET) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BF0668C5E7 for ; Fri, 23 Feb 2024 16:31:30 +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=Fe4UNYz5; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id CFC394D3F for ; Fri, 23 Feb 2024 15:31:29 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 9o9s7AWPnEyf for ; Fri, 23 Feb 2024 15:31:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1708698687; bh=bkerlOumN677HTD1C3BkVHPJgU+obZDE994OJszR6Ug=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Fe4UNYz5RnYaxa4FU4coGeje4zPXdkKlaahFKNz+T3G5/sNZoBPxb2l6mBJVp+oHQ r0ZumP4u2OjWQq4a91SZ7oBvVnVC9Gs9M7I4HrxvQmaf2MDFot7PaOaSdQrfTbqdMM 2CRyVxOYqaXZC72+5ssDvi7B5xqwEdyOQ4/VwlEwZObVZ1puzpFjiE4JCDuwJaIDS1 y82bxZGk3s1HykXV4mgYIrovM8WHeq0eMOa772Wq5typ8eYTQ/Ug3wLEwvsWraalA3 MDWHl3NY5mL/w2bCY7BAw9LyiBzyv6eLy0ntnT/MLTTPgW5WrWB0n/9O5Fm6G8Qc0Q 1YeXQnOEPo6MQ== 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 3D4D34CFF for ; 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 DD0933A076E for ; Fri, 23 Feb 2024 15:31:21 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Feb 2024 14:58:24 +0100 Message-ID: <20240223143115.16521-3-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 02/38] lavu/opt: cosmetics, move AV_OPT_FLAG_* out of AVOption 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Also drop an obsolete FIXME. --- libavutil/opt.h | 69 ++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/libavutil/opt.h b/libavutil/opt.h index 6ed3407b09..36e28249ee 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -245,40 +245,6 @@ enum AVOptionType{ AV_OPT_TYPE_CHLAYOUT, }; -/** - * AVOption - */ -typedef struct AVOption { - const char *name; - - /** - * short English help text - * @todo What about other languages? - */ - const char *help; - - /** - * The offset relative to the context structure where the option - * value is stored. It should be 0 for named constants. - */ - int offset; - enum AVOptionType type; - - /** - * the default value for scalar options - */ - union { - int64_t i64; - double dbl; - const char *str; - /* TODO those are unused now */ - AVRational q; - } default_val; - double min; ///< minimum valid value for the option - double max; ///< maximum valid value for the option - - int flags; - /** * A generic parameter which can be set by the user for muxing or encoding. */ @@ -321,7 +287,40 @@ typedef struct AVOption { * Set if option constants can also reside in child objects. */ #define AV_OPT_FLAG_CHILD_CONSTS (1 << 18) -//FIXME think about enc-audio, ... style flags + +/** + * AVOption + */ +typedef struct AVOption { + const char *name; + + /** + * short English help text + * @todo What about other languages? + */ + const char *help; + + /** + * The offset relative to the context structure where the option + * value is stored. It should be 0 for named constants. + */ + int offset; + enum AVOptionType type; + + /** + * the default value for scalar options + */ + union { + int64_t i64; + double dbl; + const char *str; + /* TODO those are unused now */ + AVRational q; + } default_val; + double min; ///< minimum valid value for the option + double max; ///< maximum valid value for the option + + int flags; /** * The logical unit to which the option belongs. Non-constant -- 2.42.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".