From patchwork Mon Sep 13 13:53:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30211 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4021643iov; Mon, 13 Sep 2021 06:55:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwFbyM2I5yB/gi6H2bZZ2LDjgX8XKuhx3kDvBXE5WNLGOkDez8U1EbXPfm+yzx8D5fmf20s X-Received: by 2002:aa7:c408:: with SMTP id j8mr13381763edq.280.1631541308953; Mon, 13 Sep 2021 06:55:08 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n10si9441788edx.387.2021.09.13.06.55.08; Mon, 13 Sep 2021 06:55:08 -0700 (PDT) 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=@outlook.com header.s=selector1 header.b=k1YiUjCn; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8369E68AE5D; Mon, 13 Sep 2021 16:54:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069079.outbound.protection.outlook.com [40.92.69.79]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C26A68AE0F for ; Mon, 13 Sep 2021 16:54:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HLxY2GJ9Im9pxVSdgOSPYY/pIGAkQAE7+XM90JGJCh+rKmdMEUpVbidBuBQjNaRmVNaM97bnsLAzppI6hPhSYK5SCHbr7hkLevst0yc28nizYwzDLsFmNR6sQJro/Ib+F0/l6IHHPRV3n/sfNn5JyxmwT8rOMpKjtTR61qzXjQjAp4ljAp/I+WB7+Q4Y/Bm6psMMO2GijfOBxLZXE7Y3Nt187TJ46IFDRq2PHKLdVSFaoC+2YD+5XrXviF+CHo0torvv4HqQiSk3tTe8nwoipySiYykJa8jitKd1BhOI2HAgnbrlIsNpIWPS234L+7EAWm6jEHLSPeQfGQJIOpbpxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=rVnqLu5uJROXbHTctLZqZatfZmKVZUkKxwdbmsD8oJc=; b=kV3nniUO0Fk8MzuRFRxOIK8G1M4gFEDSFJYihOhKNbmBfZF+sLmXuQ3dgzecW0mamXin2pZyCG7PdNHv5d/v6zToDBMwRZUDBZgKxt0Pt3yPCntnkQDtIrXMQ5cbjEcXz6ebww3iXq7M8WG5LGYdqwvtrKYinFwcxsfefHt2QhR4MjZKn9QJKzFEZQOEWyOoizmjKHkiJGiGGTX/nih1jdP2F/X4+QjzPMFTmIkWy1kQDfrAhiEN1xT76Gy7VC2wwOqVAwfsxSZplVkw7XRQWp0pHt+9lX++/mnLPgzczK+T9GAF1aF54C003D2f7GzYQ8Rb0M6YhLbpzFPTSGDMww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rVnqLu5uJROXbHTctLZqZatfZmKVZUkKxwdbmsD8oJc=; b=k1YiUjCnN6WMKuA87mEQrMIVhTdBt/+wGcehx3xxsAi8nqj6z0OEJezlbqveF1amtoatZuak2G033Lk1LZQLq8W4qm0IKHctUIPPBm7lOQqllPU6JNG7w8wnAzrPgEZfJMMRuSAKcc4D9B17dzXMzMSbj6H3V/Ug4DJz42EDHsTnU9UyB1t7zbTuYoEnK/MVeFPdmqdKFHZElmN1e+QxEF+2H/P0IBsx9IIsBoRjxR5nY12Rw/R46j2bECLtRBTatfOp6lxWLNq37XMhTlVHp61YHyC4ONOwGXyZJ08LQxonmDMZziWYdh5IFBJ3W84/ZJL4OXkUJRyaC/IpdZCNLg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6627.eurprd03.prod.outlook.com (2603:10a6:20b:1be::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Mon, 13 Sep 2021 13:54:05 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%4]) with mapi id 15.20.4500.018; Mon, 13 Sep 2021 13:54:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Sep 2021 15:53:35 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [0K5AY40w7w237fwDLgfjELlJq/htWJab] X-ClientProxiedBy: AM4PR07CA0023.eurprd07.prod.outlook.com (2603:10a6:205:1::36) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210913135336.2804405-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR07CA0023.eurprd07.prod.outlook.com (2603:10a6:205:1::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.8 via Frontend Transport; Mon, 13 Sep 2021 13:54:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 36aba665-19e5-4a61-d07d-08d976bdf359 X-MS-Exchange-SLBlob-MailProps: Zv/SX2iM+5Wuxh+ZWr1Yb7sNHtcktfNaLdegw4IoVxcT6uCMtUXnxkdD5W+G85n3Vh/7HNKton31G104gV0runfoYC+gqkzAJawNX7W4LcFHUa/SyWBTJ83wArjxcg2oiP7UCxAUV5sku6ym2mI+ux27o5U6817RQB2Fn1L4JjiKlCzkYTjmyIWTb1on7QO52gpLjgb/X5rFvaZDRXkDi/HfrMjmDHdhvaw1dMp02Qe44YbJrUz9RyI2MbF6e1hLES8IWifQ34/aEpf33mX2w+o+kIfPkBHET7ZHdpLiv08kQ114wIzOopE4L/mkQxT7TrCzOX3V+sr7wXLdBbkWzZeyWTa2TIpqo+zVxa6dB6oUPQriJ7v5ANvw3GsPgmSoyzAgXI0XdM/gzKJKVwlKqjpBY6iOAEQPlgrvdezrsg12IJmeAHqtSlwItotadOQIzxkDT/wpHRBD53BCsCASSacVelSLzHYv1MKILP2ZyRMMX8FZh8fNWV4C4lovo7JJeRQpiJI4nLYx7wcDx5hVH3+tUaZvC8mCARQQI4HftEFOR4t5lqil6dfmwK8MkAfqsJZXtGBmnKqUDgXznpvYtubH9n23I5syLWh/wza8pWAD6uyL5ADyYGajk5195PhM5NbIkccvTBKU/5Olw52SvZ2AHDgfA4VFuqgbEBAKawt2lxR4SI4M2uNMxT/Hlgd/SoSmAksS9IQ= X-MS-TrafficTypeDiagnostic: AM7PR03MB6627: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nNEw0HAvXZ/Jyp85PRlD4FA3ZK2aHlNd927Kek/xuH2ng4sVVxM9Ie1w7QqYEVW/Qca/uUkz60TZW2XaIHmjRbkGB9q2tZIq0PvVSeX5yjVckRNlJ7g5AB5ynEFQqCNP9keV2f/IJ1qu0/wNrnMfXQPZx4nsSspxv8oqwGE6qMbwuLem1rIyL57bTU7grCO73Ax+uGhNxZiwZd5Enkke/6n08J1C05UND3zMk7Qy1o1YnGRN/nKpOiUYtDwESJhExHC3yv6HikWod3Msk8i+Y8wJwDm48PQ2mMtIMTy+Q9IgviWRDCDU6opKodjY92qB4bLYb73PaMut2f14+npl1X0ppxkNeioggnrBD9l48JxTqQ+4zse2+GiOPeeOkbGG+MHon1XtuxPyOYQRDMKcdNKcQSFF/9W9mIXktOp16Oy3m1WUnAwkp3fQIVgyQaEF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SNgCANkvImIJH45FQaQfotsivfoTU5hG3RyZdWFHLyZhhkDghZtPd1FQ0ERTAeqhANv9VLC49bw0fWmV7R1cHKyOQlvk1Ttuch6uA/jWhWT6JEPpf9suGMg5cMgBsS5qxg+KrsoMrisFKKZ8QKTLfg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 36aba665-19e5-4a61-d07d-08d976bdf359 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 13:54:05.5800 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR03MB6627 Subject: [FFmpeg-devel] [PATCH 09/10] avcodec/avcodec, options_table: Deprecate 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 Cc: Soft Works , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: IQVD69bSwjLx Unused since 1f63665ca567fbc49fa80166d468a822c2999efa. Found-by: Soft Works Signed-off-by: Andreas Rheinhardt --- doc/APIchanges | 4 ++++ libavcodec/avcodec.h | 7 ++++--- libavcodec/options_table.h | 4 +++- libavcodec/version.h | 3 +++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index cffab2059f..5c52490392 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,10 @@ libavutil: 2021-04-27 API changes, most recent first: +2021-09-xx - xxxxxxxxxx - lavc 59.x.100 - avcodec.h + Deprecate AVCodecContext.sub_text_format and the corresponding + AVOptions. It is unused since the last major bump. + 2021-09-xx - xxxxxxxxxx - lavc 59.x.100 - avcodec.h codec.h Deprecate AV_CODEC_FLAG_TRUNCATED and AV_CODEC_CAP_TRUNCATED, as they are redundant with parsers. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1b70a08980..7ee8bc2b7c 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1857,13 +1857,14 @@ typedef struct AVCodecContext { */ AVBufferRef *hw_frames_ctx; +#if FF_API_SUB_TEXT_FORMAT /** - * Control the form of AVSubtitle.rects[N]->ass - * - decoding: set by user - * - encoding: unused + * @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 diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index e740112d6a..130341a2ec 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -368,8 +368,10 @@ 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"}, -{"sub_text_format", "set decoded text subtitle format", OFFSET(sub_text_format), AV_OPT_TYPE_INT, {.i64 = FF_SUB_TEXT_FMT_ASS}, 0, 1, S|D, "sub_text_format"}, +#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.h b/libavcodec/version.h index bb70d4d152..8da80a3670 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -84,5 +84,8 @@ #ifndef FF_API_FLAG_TRUNCATED #define FF_API_FLAG_TRUNCATED (LIBAVCODEC_VERSION_MAJOR < 60) #endif +#ifndef FF_API_SUB_TEXT_FORMAT +#define FF_API_SUB_TEXT_FORMAT (LIBAVCODEC_VERSION_MAJOR < 60) +#endif #endif /* AVCODEC_VERSION_H */