From patchwork Mon Jan 16 13:38:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40037 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1d43:b0:b8:6755:f97e with SMTP id cs3csp1037581pzb; Mon, 16 Jan 2023 05:40:26 -0800 (PST) X-Google-Smtp-Source: AMrXdXucwZLsoWRK/ou5fEguMpzghWTvPLhHm8lJRrB5ObgIKbwkiMOINCBzzzYqhXwid0GNl8Og X-Received: by 2002:a05:6402:5505:b0:499:c332:3b50 with SMTP id fi5-20020a056402550500b00499c3323b50mr23095911edb.39.1673876426529; Mon, 16 Jan 2023 05:40:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673876426; cv=none; d=google.com; s=arc-20160816; b=WT4ZXBODS9dd2s1hQ2YyMIL0Hv2W1xzK0V4Srx7sOtefOzLI5ORO/UQ3qGvZBR3X5x VVxRhqND/+vPaEaqkwxN2apu6RJof8/CbizDRQfNnIyG+fu5fcdpgShYKW5e9dgB/abR 9WI1WjJRDJryk3Rdo/5lWDtsXjk78NxZB0aphwOn2o0FCFTw6JwzdVrgdOVDJ5jVd13w Us3mqgle6NX1zLYKnbX0NDjJv0Wypq4eSd6WKhGlf/+hKS5zwbSK8I6uIqqUhpjRNks2 TCwD5dwcirS/DxH8lIWdvlpYzWEkKHx3HvpF9mdvcYNPj8o6Yp9XFtMHtpM1hBh2AXkp SuoA== 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=UFbItgk/LblT7O7UWna/dCE62AxX5nnUKBUMva8mM1E=; b=hGlrC6pj25ntwRjne7juTFknRCkdyxvL1ZXPDeIFumL5xZcUYwDO3CdDLcdl/rDc8O ESOXLKd6NXY089fng5oMVzKC8OiLx+MnbX7Dlgabce6FwsG3rv9E296gXP52R0nmXUd2 6HBXBQwVO1zeG3EK0BlVFjGresCfMC/+3tA1gGJif3/rpoDG6ygJBCkr/qTUTOGPyIaJ snCIBa4RJHKJpl0woeAYZH/ExQYoC1UUNHagiN9ZzEiI6JrI1LPBSK95EfW8D/3ic7ad LmyfbLayq86W2lukOOdq+tIlqEPJFmvh6ss9ACgBn80Fw4sLvw8bpy5pdbVQALKk5Cpk cRqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=OSSsabuG; 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 t4-20020a056402240400b00499b52316fesi24307997eda.326.2023.01.16.05.40.25; Mon, 16 Jan 2023 05:40:26 -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=@gmail.com header.s=20210112 header.b=OSSsabuG; 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 DA50F68BDDA; Mon, 16 Jan 2023 15:39:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com [209.85.210.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1417768BDB8 for ; Mon, 16 Jan 2023 15:39:16 +0200 (EET) Received: by mail-ot1-f53.google.com with SMTP id f5-20020a9d5f05000000b00684c0c2eb3fso7054726oti.10 for ; Mon, 16 Jan 2023 05:39:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=8Gpylt2xD/HACJDOQKuBvuQ/qegF/Jpo29TEVLMeJa0=; b=OSSsabuGoiXAzM+gFdep/UStUUxwQIlDw8uE9m8osfP52UG2rzo9Sfh3Grwum/ea21 XpJRLc+q0OsHYG+oOjREs+fdWXqo4RYAnJuwiVaussrcQgGoC4RVhNxjMpdJiUmKt6It snAlN0j5+laYGYwUyOdqi/6g/KHKbiiHoIZbp2B8POgIxSHgRyITnJ8L6Z02tJJr6yIq 5WoPL1+DFj2WQAQwvqVsgrveXrLp2w0E0KoA1wdO0+AhRTIFRGAIQaBcoxKgiNCddE7O TI2IlpUK7RP+zMw8U2lxeDotzHbTi9MwCXjAKD0kl7/HztArPRxlD3tT6XTFnAncj/Jf FSNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=8Gpylt2xD/HACJDOQKuBvuQ/qegF/Jpo29TEVLMeJa0=; b=r4UFBNdbnW7V0BE+ky8gxR+KXqLdZgcaksXyOiioIOlgapK+3t0auim6Al8T2FtV24 w/LOuepy77zAI6rAC/4S39ad5J7fTHiAekH9mvhTqXrd84SynW51sjDNZ9vbwtYiILoY ljHO3XsJsnfT59+nTim+KcBJzHSFMgeCuEDvRasHwy6vfeLurIcHVSTmyhZnCqaeN1t4 7heZ8IBYQYrk/cY/QhxhTCxiJtNb8RbGi33VUBdTDQhXTpJPOocn0pUhUaak/lTTUsFA K3GXt03HN+rbohqDlgBweDcTaJyaVNwZxcnqhzYxKT6b10ztARu7jqmOH71WExMW1eYO jYzw== X-Gm-Message-State: AFqh2kpbSBUBi3lMAdgwwnaG6n+udovmLrz19vZ4HdMw7M4iDgD3eBBb n5zFMiQsNjuBUdExkSgvDPvTVYyufFU= X-Received: by 2002:a05:6830:2785:b0:684:cef4:810a with SMTP id x5-20020a056830278500b00684cef4810amr6969111otu.31.1673876354412; Mon, 16 Jan 2023 05:39:14 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id 3-20020a9d0303000000b0066ca9001e68sm388524otv.5.2023.01.16.05.39.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 05:39:14 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Jan 2023 10:38:20 -0300 Message-Id: <20230116133840.512-7-jamrial@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116133840.512-1-jamrial@gmail.com> References: <20230116133840.512-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/26] 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: H0DY5HYx+SL5 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 4e8417ca07..ee5acc5c9b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2342,14 +2342,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 2e05d29e1e..fdfbc0abab 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 d66754f9f5..80097566bc 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)