From patchwork Sat Feb 4 10:41:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40256 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1869426pzk; Sat, 4 Feb 2023 02:45:38 -0800 (PST) X-Google-Smtp-Source: AK7set9Izw5kNkYFJgjCXDu9Rbg0YrwwbBKuPTx1yMQTVh4z5KkgbXh4bua+KZAvx4pNuEpr0hyr X-Received: by 2002:a17:906:cc8f:b0:889:d998:1576 with SMTP id oq15-20020a170906cc8f00b00889d9981576mr13173928ejb.66.1675507537960; Sat, 04 Feb 2023 02:45:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675507537; cv=none; d=google.com; s=arc-20160816; b=GGpAOEw/kymjvjK6qLGs2SvUnfg7opIuASPqLXiL/SHiO31dzUkoCEMDo0Utw2zKyY wuGGQtJu0KknaiSS0waB3VmrNRB1+5+DLjra6DhAtioQ+U+XzrHnSRlJ7qXli/mtbASM vkVvmNh5qKzmf4Vkvf5kO5SeD4dwzvL0/Nz1rQsJZuiHL52AiNg877BE7hkAtpB1Xdr9 N/RVBHCrVj1OODM60Nd0aGvxLocakERJjqletAMy70jlxeswaIl1gXdjFmV1sCQcnBdI mPUQGaA3FYgSFYyUAHWvi0y1jCyGXAj/blJWvl/gv/44bDRpnXDXJ+m7+z4FYEOfH94U GnMA== 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:delivered-to; bh=K0y6GA6DkWqxr0SmnkqDgzqDEYEVEfzkKaGecaf6YBU=; b=AXQs6gxI3KCpBHuh7D7dxzM5KoapQymA30ZtcF/BOeOj94FLpXdRRswGASCkQnsIfW 82CF+DqGsRA5l0d2vVzJIgzALjWvpUbAQOe4XNWYCcLZu7JDhKy7ZrN+xXdWbEam9pSj pyKqFWpWcoZlpxQ4lhFor6N79yP8DsTOD2uq8AFoPwwN5Aj7Lb48PvoH5/4FqSLeizT8 UHajw19cJeG2Cni8RNDy2wiiI2NwpYDoRC01QHlOcG52R915z0+CS6TKUT0jnHvUiZGy uB1vq6oLAc7v0eniRG87VHABPKZFSgm38XZ9xFO+8OV7lnPZcnC7FwHGQRfMMrf/JPV5 Y7Gw== 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 z26-20020a170906271a00b0088f1e51d2b2si6194955ejc.52.2023.02.04.02.45.37; Sat, 04 Feb 2023 02:45:37 -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 61B5368BE88; Sat, 4 Feb 2023 12:44:24 +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 513D568BE8C for ; Sat, 4 Feb 2023 12:44:15 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 0E0F32404EE for ; Sat, 4 Feb 2023 11:44:15 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id Um2skSkdswSP for ; Sat, 4 Feb 2023 11:44:14 +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 16F61240D0E for ; Sat, 4 Feb 2023 11:44:07 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 9A9D83A0455 for ; Sat, 4 Feb 2023 11:44:05 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Feb 2023 11:41:43 +0100 Message-Id: <20230204104204.20721-13-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230204104204.20721-1-anton@khirnov.net> References: <20230204104204.20721-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 12/33] avcodec: remove FF_API_GET_FRAME_CLASS 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: 67aWKpD3SW6b From: James Almer Signed-off-by: James Almer --- libavcodec/avcodec.h | 8 -------- libavcodec/options.c | 33 --------------------------------- libavcodec/version_major.h | 1 - 3 files changed, 42 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 25c4b4eacc3..8aa08500a46 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2370,14 +2370,6 @@ void avcodec_free_context(AVCodecContext **avctx); */ const AVClass *avcodec_get_class(void); -#if FF_API_GET_FRAME_CLASS -/** - * @deprecated This function should not be used. - */ -attribute_deprecated -const AVClass *avcodec_get_frame_class(void); -#endif - /** * Get the AVClass for AVSubtitleRect. It can be used in combination with * AV_OPT_SEARCH_FAKE_OBJ for examining options. diff --git a/libavcodec/options.c b/libavcodec/options.c index 2e05d29e1ee..fdfbc0ababd 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -185,39 +185,6 @@ const AVClass *avcodec_get_class(void) return &av_codec_context_class; } -#if FF_API_GET_FRAME_CLASS -FF_DISABLE_DEPRECATION_WARNINGS -#define FOFFSET(x) offsetof(AVFrame,x) - -static const AVOption frame_options[]={ -{"best_effort_timestamp", "", FOFFSET(best_effort_timestamp), AV_OPT_TYPE_INT64, {.i64 = AV_NOPTS_VALUE }, INT64_MIN, INT64_MAX, 0}, -{"pkt_pos", "", FOFFSET(pkt_pos), AV_OPT_TYPE_INT64, {.i64 = -1 }, INT64_MIN, INT64_MAX, 0}, -{"pkt_size", "", FOFFSET(pkt_size), AV_OPT_TYPE_INT64, {.i64 = -1 }, INT64_MIN, INT64_MAX, 0}, -{"sample_aspect_ratio", "", FOFFSET(sample_aspect_ratio), AV_OPT_TYPE_RATIONAL, {.dbl = 0 }, 0, INT_MAX, 0}, -{"width", "", FOFFSET(width), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, -{"height", "", FOFFSET(height), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, -{"format", "", FOFFSET(format), AV_OPT_TYPE_INT, {.i64 = -1 }, 0, INT_MAX, 0}, -#if FF_API_OLD_CHANNEL_LAYOUT -{"channel_layout", "", FOFFSET(channel_layout), AV_OPT_TYPE_INT64, {.i64 = 0 }, 0, INT64_MAX, 0}, -#endif -{"sample_rate", "", FOFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, -{NULL}, -}; - -static const AVClass av_frame_class = { - .class_name = "AVFrame", - .item_name = NULL, - .option = frame_options, - .version = LIBAVUTIL_VERSION_INT, -}; - -const AVClass *avcodec_get_frame_class(void) -{ - return &av_frame_class; -} -FF_ENABLE_DEPRECATION_WARNINGS -#endif - #define SROFFSET(x) offsetof(AVSubtitleRect,x) static const AVOption subtitle_rect_options[]={ diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index d5d55c6dad0..1a6a60942fc 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -37,7 +37,6 @@ * at once through the bump. This improves the git bisect-ability of the change. */ -#define FF_API_GET_FRAME_CLASS (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_AUTO_THREADS (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 60)