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 DA8E54527E for ; Mon, 16 Jan 2023 13:40:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A217368BDC0; Mon, 16 Jan 2023 15:39:25 +0200 (EET) Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 851D368BDB2 for ; Mon, 16 Jan 2023 15:39:21 +0200 (EET) Received: by mail-ot1-f45.google.com with SMTP id d6-20020a056830138600b0068585c52f86so1489867otq.4 for ; Mon, 16 Jan 2023 05:39:21 -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=5eQuSxm3+KFfvU6nMYFCCzGjGNCi9hWCqnDVcgCt29I=; b=kO23eBeBh8wdId37d9raEIIGc9ShW2wQxEjaFD3diL6stp8B/tanUyzRW18BHUW8p/ K5aFfwYXse0t8L1/FGoW9NBTh8tydAzlQjI5U84J1FisoQrD4Re+02QEeV6ws9bhG/eV HJgu2tYTfsGH2Uwg9sCOyt1vAHs0bI1R4dtMCaLnFZSVaN39FqJxVEH5sxBm0E6viQXV M8PZ96J+bjjUqxPm4oXwYumijIqnYxRbDkn5C+Z+ZBz2r7AicEXzkqvXOudEVQ4976uo h27XGq0dLViO3EKs5KBj9dsC5vKN2UTU/5NXIWLMgJo2jdZwMJF3rBXkym+XuECumnHb cBVw== 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=5eQuSxm3+KFfvU6nMYFCCzGjGNCi9hWCqnDVcgCt29I=; b=MSAlgbu7jzc9iL8HGngVBF4REyPsXE1YZXnMC0NoA6V5X7paG6PDgLrvyK+qSA6YgA NCe7cuV7CejhVo/tHG/2Q5uEaRQSvUaSwb4DE22XcPbpS1GmEPgWmwqUVsj7oIWlnd42 DAA4sGM6Lv+pzLDmvo7MKrDxYZcMqaJcF1RUFo4sxVGtlhhvjOkO9CEsMkwj51PQ84ra xQz55BVSyJowxCIWsoOC/p0L9sbIx4Wz3UoLp0KqNzPtFbi9FqLP02+Q4dMdDa2uigIR xcOFmKoqGODwUTPwOzjihTrbtdeukt1dBrPRAnrqfdANWQXw8NdHIzs6hyIpJ2SQNp/I wx3Q== X-Gm-Message-State: AFqh2kooeJmyOkkzWMgoC6cqJ9rC0pAdVp/HRBwPel/OruEgZCaUhp0V VyIHJ9E7/i923WWmhc6lofZhRxSN5Ck= X-Google-Smtp-Source: AMrXdXuU+zpSplLBDLjNpgpM4gOEhzK4VFiK1tvz2BAdk07+74FtscHB6HeMyedrc6wDmREoZGbIgQ== X-Received: by 2002:a05:6830:6209:b0:661:dfeb:a95e with SMTP id cd9-20020a056830620900b00661dfeba95emr13342875otb.9.1673876359325; Mon, 16 Jan 2023 05:39:19 -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.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 05:39:18 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Jan 2023 10:38:24 -0300 Message-Id: <20230116133840.512-11-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 10/26] 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 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: 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 86228e64b4..e2582f2484 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1840,15 +1840,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 f6f73fb3f9..b262bcbacb 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -374,10 +374,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 a0cd3728fa..e162bf708c 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) -- 2.39.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".