From patchwork Sat Sep 11 08:18:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 30131 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2237339iov; Sat, 11 Sep 2021 01:18:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzlD5sd5T9/hjyHC2tBQCLkFxBZel4wPBlaRh9DNqzEOwBcFrCJSKUzLB7fQg9OWgH+hRqt X-Received: by 2002:a17:906:38e:: with SMTP id b14mr208757eja.229.1631348294152; Sat, 11 Sep 2021 01:18:14 -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 e10si1607970edj.222.2021.09.11.01.18.13; Sat, 11 Sep 2021 01:18:14 -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=@hotmail.com header.s=selector1 header.b=jgmoygYc; 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=NONE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 07CCD68A62F; Sat, 11 Sep 2021 11:18:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02olkn2107.outbound.protection.outlook.com [40.92.44.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6AAA2687F17 for ; Sat, 11 Sep 2021 11:18:05 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MySW+5mQ+d3fJUi9VU2tlhCwnwPEjxFaRM5vcU0VcLeyZEH4xqj58q3UvLhrMJZ5BqgqPzFbCNRn3OTNYQxbrViKJNZ+DCHidy0bTyQZKMcFMHZmj0vgyDhfh5gVliGAQaEY+mffz+Y5WqhoeBYNHkrB95kqqXPGJGCAJANzjOTGV5GcEakAnLnupc/cJ23gGInnCPWRE+TTnJNnPcfWZc4XB80DkEcbtmR1u1svNkrad9XzX/zDkLvMHkzNMqr9HMT70v3lIigJm5/AupzqB19vJtpZ+7EOVBUpSfGvqS5iQ31BJk2YiqF9U0hfLjIBKtD3rGxsXG5kPVDHg9eZ/Q== 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=zAf3Wew/OswdJdb61QC5PueC4riWpo5NevDDOlFCxes=; b=BQRYzvZwt1b/7zklj7+G26MxCrJrX0Ub+Qb/w+XrLk74Oz6cdR4qeQG1O4H4DCIu5wa91YCEZRHvz0E6p/Q70RV8H4zQQk1dedjQMOhseXH3+uNMiyC2yspF3H0q/uueAysPOH8Eq3Wa/oF/kBV732lrYnFbHP1ZfBWY0nYRZj9E3dr9YZepWfQAicvBJdhni1eTc+dF8J0ghtr+192baUWQqWpD2EOX9bvNqIIP+T6gUByfRL8GChNw3Bw+y3hVjZx1kJgg/Xnx2m9czMkCoWlzOTp8nW6UKL/v8Ziq5AP0Ai3E9lNXnnJBOhH99n716jdtR+pRta2SzPoIOJ/gvg== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zAf3Wew/OswdJdb61QC5PueC4riWpo5NevDDOlFCxes=; b=jgmoygYcnkJGBKaMGpbQtVVvlGz+lhhZ6Pvn9/StK2lfebQDcPhN9inC3JfFbLfh+EMSMkh5KnXJeQwmaLoSKDr9Uhl92hFMLObExC2Tz5L1uDU/NsHmRY3awiDB0eG5LTGTm2TeoL+t8q627lTCnbUD/gBbGQpnr+O9nB8RNpmsbbsuR6s90LNUqHnAY+xiEETwhjqCjtRiqNFIWLdEcMGJpZ4gnFqN1aanCsvBLtFpMig2nBTedUf6nLkvcEDs2NjXNdTQy7qxqPgedXBsePAeMqSNghFCFL+iJHDCrIuzmSNfRbddi8xac1y36JWy4cDllWPxOmq8yGW7D1bIDw== Received: from MN2PR04MB5981.namprd04.prod.outlook.com (2603:10b6:208:da::10) by MN2PR04MB6048.namprd04.prod.outlook.com (2603:10b6:208:e5::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sat, 11 Sep 2021 08:18:03 +0000 Received: from MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb]) by MN2PR04MB5981.namprd04.prod.outlook.com ([fe80::ecfe:2528:2012:22cb%5]) with mapi id 15.20.4500.018; Sat, 11 Sep 2021 08:18:03 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v4 05/18] avcodec/avcodec: Remove sub_text_format parameter Thread-Index: AdemtA1o+D+dAr6+QWmZuV7w06DPvQ== Date: Sat, 11 Sep 2021 08:18:02 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [AlawPaCZh6Wdym+iceOSpiinxxA98gNN8H7jwXLRRGI=] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1ff3c6bd-2870-45d9-68c1-08d974fcacdf x-ms-traffictypediagnostic: MN2PR04MB6048: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: mbJAcopY16t76brQxOHVApfxufkOV7ZQ+O2XXKrOoYMJNzDGEPcdMEmFYochNvrdg4fgWlAyloqF19TVPxpOP7QxvEinGy+KmUVXIVxQcXtLPvHl5OZduxmNFf52XqQauu6X9YgMSUEyk5MLH2H20G/n750jfdFQVY1Jj4bS94ZNQBBhVFIygaAxC342ymB1dvnTq0f6yI9iA3DAT6QlBcAMgbzHDzkNLgJROauQbaESXsYRIqGUL3ua0WZO0ZYevD0uvvKHq+RQ+h8Q7bsEyxVziW2t22DXy2+2WSZdQslt2Tp3LSG0Ei9FsBDb+ET17N5YYru41ZYYuKbIKcGuMhQ6NQeh00AfKBFgHAdFI8TOuHry3IOcvrhNCI45XrZLXjJymkp2VpGMatqoGCGmwjFY0lGuHga4HdcaCkKRkVCmBzz9kn4+lVkK6bsRtXsT x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: XDUG+8aB/fERO3JUADP28ruf0elYQm8foScK6PVp7Inz95CWP+HHHwefuMwtdzq0Nhus1dWWk+oJMSlltbxj3iKYevPtg1zUb8esCpR8EE3+pVjzQXZnVsJYQyuuc092Mzj7cGjl0HaHVWCIvme9hA== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-3174-20-msonline-outlook-529c7.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN2PR04MB5981.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 1ff3c6bd-2870-45d9-68c1-08d974fcacdf X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Sep 2021 08:18:02.9599 (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: MN2PR04MB6048 Subject: [FFmpeg-devel] [PATCH v4 05/18] avcodec/avcodec: Remove sub_text_format parameter 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: YQd46N8ga4Nv It has never been used and going forward, there's no perspective that it would ever be. Signed-off-by: softworkz --- libavcodec/avcodec.h | 8 -------- libavcodec/options_table.h | 2 -- libavcodec/version.h | 4 ++-- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 0f71b42d61..01c881e6d1 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1854,14 +1854,6 @@ typedef struct AVCodecContext { */ AVBufferRef *hw_frames_ctx; - /** - * Control the form of AVSubtitle.rects[N]->ass - * - decoding: set by user - * - encoding: unused - */ - int sub_text_format; -#define FF_SUB_TEXT_FMT_ASS 0 - /** * 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 ae42b65b7b..8a61154653 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -366,8 +366,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"}, -{"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"}, -{"ass", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_TEXT_FMT_ASS}, INT_MIN, INT_MAX, S|D, "sub_text_format"}, {"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 4b4fe543ab..0fa5b1a72a 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 59 -#define LIBAVCODEC_VERSION_MINOR 7 -#define LIBAVCODEC_VERSION_MICRO 103 +#define LIBAVCODEC_VERSION_MINOR 8 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \