From patchwork Sat Feb 4 10:41:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40263 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1869811pzk; Sat, 4 Feb 2023 02:46:32 -0800 (PST) X-Google-Smtp-Source: AK7set/vU0AbuFc+EcgHpmHgbmC3nJIrmwxT6YwKzX4vZ3jE3cCnyGCcV6038ZYVxT+Wu4bKd63X X-Received: by 2002:a05:6402:64a:b0:488:6003:24b6 with SMTP id u10-20020a056402064a00b00488600324b6mr13120731edx.40.1675507592821; Sat, 04 Feb 2023 02:46:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675507592; cv=none; d=google.com; s=arc-20160816; b=ByVdY8iBFa1RS04oybv9uk6GMlIjyW1AxNvyJzuLqf30yDz1HhJQ3nngfzz9lUtpca HF9DPw3jo/FaJ7ldqZ3NF5Nx9uQyUYEazYW4yTyYk9at1+OVVLvpY62OIbaYvivfxiAZ x3UXnr+6+0DlbyNzXqNLIir1gPArn7qmJzaOqDwAZcgkTpWYUTtklrEM/jMp1tpJMsq2 SISLeU9w5fDbhZ6Ipom++mes1/1+3K5if3Mi9+H9U0Kg/DQ58Up5bYT2ysmf58cita/z sh/52+TL3ODVvRmhg1uau9s1Dvqb2OGlX8W9kD8IUSOJ8vaK5SwTQtmokEyAkNgEbrP2 /TiA== 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=xiqy05eZFMT1U4VSA/CWyChUQpSu8rzab+rz6qvw8wQ=; b=ON8SlvuvLgjmwEj4RpDaFuum3Lxd4tzN43kzkPoBmBMfQHOSuN3FCMGMiDXzwNHPrB 1ui/12HXKHaiTPK3SPBz2N6tK2CJPfQXODWc01yeyqxdQ5gg7zSvZm/r4IdDuA8siC7/ YERZF62AO5cwEByLiyf9rQocj4lCmCX38x0aX3/HcROOql0ibDODjsD2HXpNVONiqWa1 2TJFJ01T45xGamVjgrhD5Tl/Z03aKl9bB2VIN0DFaQO+SMgmhrEcACYQpfmLqnkOqna2 /0wt56NREv9pSvkOlv5/m/NbvBUGbUXh0YOSf7oRvotnFJmEzLFMu42fUx8Ie1ppQBiJ GmqA== 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 r3-20020aa7da03000000b0049eee6721bfsi5785630eds.579.2023.02.04.02.46.32; Sat, 04 Feb 2023 02:46:32 -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 491A268BF14; Sat, 4 Feb 2023 12:44:31 +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 9A8BB68BE0C for ; Sat, 4 Feb 2023 12:44:17 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 67BCC240591 for ; Sat, 4 Feb 2023 11:44:17 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 9fnDODG2IZvC for ; Sat, 4 Feb 2023 11:44:16 +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 1F281240D1A 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 C97463A04D9 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:47 +0100 Message-Id: <20230204104204.20721-17-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 16/33] avcodec: remove FF_API_SUB_TEXT_FORMAT 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: B80Pq4LyCMWe From: James Almer Signed-off-by: James Almer --- libavcodec/avcodec.h | 9 --------- libavcodec/options_table.h | 4 ---- libavcodec/version_major.h | 1 - 3 files changed, 14 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 9066f6c5297..ecd02ff4747 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1868,15 +1868,6 @@ typedef struct AVCodecContext { */ AVBufferRef *hw_frames_ctx; -#if FF_API_SUB_TEXT_FORMAT - /** - * @deprecated unused - */ - attribute_deprecated - int sub_text_format; -#define FF_SUB_TEXT_FMT_ASS 0 -#endif - /** * Audio only. The amount of padding (in samples) appended by the encoder to * the end of the audio. I.e. this number of decoded samples must be diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 52ecc25cf9b..bcd6f381917 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -376,10 +376,6 @@ static const AVOption avcodec_options[] = { {"auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_CHARENC_MODE_AUTOMATIC}, INT_MIN, INT_MAX, S|D, "sub_charenc_mode"}, {"pre_decoder", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_CHARENC_MODE_PRE_DECODER}, INT_MIN, INT_MAX, S|D, "sub_charenc_mode"}, {"ignore", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_CHARENC_MODE_IGNORE}, INT_MIN, INT_MAX, S|D, "sub_charenc_mode"}, -#if FF_API_SUB_TEXT_FORMAT -{"sub_text_format", "Deprecated, does nothing", OFFSET(sub_text_format), AV_OPT_TYPE_INT, {.i64 = FF_SUB_TEXT_FMT_ASS}, 0, 1, S|D | AV_OPT_FLAG_DEPRECATED, "sub_text_format"}, -{"ass", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_TEXT_FMT_ASS}, INT_MIN, INT_MAX, S|D, "sub_text_format"}, -#endif {"apply_cropping", NULL, OFFSET(apply_cropping), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, V | D }, {"skip_alpha", "Skip processing alpha", OFFSET(skip_alpha), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, V|D }, {"field_order", "Field order", OFFSET(field_order), AV_OPT_TYPE_INT, {.i64 = AV_FIELD_UNKNOWN }, 0, 5, V|D|E, "field_order" }, diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index eea761c7dd6..04e6225f9b3 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -38,7 +38,6 @@ */ #define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 60) -#define FF_API_SUB_TEXT_FORMAT (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_IDCT_NONE (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_SVTAV1_OPTS (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_AYUV_CODECID (LIBAVCODEC_VERSION_MAJOR < 60)