From patchwork Sun Dec 5 16:23:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 32004 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3440687iog; Sun, 5 Dec 2021 08:25:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJytb6kwbXf4/WcgYHmU3OJKYPv6eWxdZ7VfNiBsZmb8kor1clwPk8jRtl8EYkf/cHfqi3dR X-Received: by 2002:aa7:c9ce:: with SMTP id i14mr45279769edt.300.1638721506791; Sun, 05 Dec 2021 08:25:06 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k19si15622308ejv.669.2021.12.05.08.25.06; Sun, 05 Dec 2021 08:25:06 -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=@hotmail.com header.s=selector1 header.b=kW8KDseE; 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 EAC3F68AEBC; Sun, 5 Dec 2021 18:23:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-MW2-obe.outbound.protection.outlook.com (unknown [40.92.23.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0FFE268AEBC for ; Sun, 5 Dec 2021 18:23:52 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JgBuse3uLuI4NiWDhr/b+FA5CbAVFNrmwD11Z1VGoNsoCul74JgtDBX++2vfLKd9QcQWFJXdAcY8YDtHj8uTaz5gqbI3Wm0YF4THidFXeJ2VSh25aO6g8KvUGOf6qC0+nrAMfkIgf3YF3yOQJhrSoXLU6R2w2maKooxPhzg0epI7L3GAOBrRDE/szm1I7fC63oUVyiSXHguM/IxWxlbdtfK55mFqMHmj10bBf3BIjXA8W4qUCR4Twt+R1RDse0pRaQeN2AH5sOjYJr4y2dVnPXBpeaDhjduuBOUpA0EkBnGNZ8COxPRy5BRTJq6HYi+2yzPgvxBjqELkZPhHi9VBHQ== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zABAXZwKS+fGKLetN9nU1YP+cWesDOAoqYEA0xTWjtA=; b=CJu71MMXnFztAmq7ZaluXKlMMiUdGJKlcj/P86xytd+4D0bGGIBhPvqUzfcLGiSF7+NpG5zQtXix5uxUgGJcXm12vEpXbzKQfh/PA8k8kDHK7BumgTU4cO6EiE8O9dwKpDaIFNlujZqUYWJH24FfJeU8DkQ4T/LUmhZN9/S+O2lDsIWU/h2cduagrWkR4GGDdWnNvq8mTsF3mkIoN1i7Dm4eVu+lZopLTllbr56YrDoW+TAUKMh8woJxaDw44OCZoQwacprILrtqYPX02bOY/vpkr9fDyj3ZHuGG8huZPEnbkS+r9OHQU+yQiwMQyXfIyj327c3Iv1lhsP0znxwMzw== 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=zABAXZwKS+fGKLetN9nU1YP+cWesDOAoqYEA0xTWjtA=; b=kW8KDseEqh4rw4H8J/B9nIDhVmuTc9PEPKX8iRBAMgAWtoL1UE2SoRepbEOJCLc+DRG/1fOUW+os98DKaoMkHuXKT209rcjadh7IWg6ML9uqaPpDrE09RM69A/5hqbwqTnHJgd9/jLVpWhrSRaM9m65BO1qbUviwkRjra7FN8SIyIM2O39IeHzszD6tiedhHFbheVnFbsFoUfCVwYTqsnDhaqp1AqBlIMdMdTPURhQ5F89TnDTybXBEWA0vLi4TAJErtweSquq45Rhjr9Rz0f/Xq8MOCFhLsoh5+oZNJF/uEHsVtG9yjIwziDsDSUEKHSaTsCss2r8B0925vKhHR9g== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0333.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:8::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Sun, 5 Dec 2021 16:23:44 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775%8]) with mapi id 15.20.4755.021; Sun, 5 Dec 2021 16:23:44 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v20 07/20] avcodec/subtitles: Replace deprecated enum values Thread-Index: AQHX6fR5d2wFVgAo7kWlodVp7skdfw== Date: Sun, 5 Dec 2021 16:23:44 +0000 Message-ID: References: <7795dfe8ba792c0f4f7f8a543d4df8adf8d8189e.1638721292.git.softworkz@hotmail.com> <4cb24bff6e1107e2275b0d28cf798b014aee3b55.1638721292.git.softworkz@hotmail.com> <221f403df00a60f61f31b8984fb5a822ac31c77d.1638721292.git.softworkz@hotmail.com> <0059b39b262fe3ecb9f149e0d3d220af4f7d20e7.1638721292.git.softworkz@hotmail.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [qBOQ5VNckjRVYCPrTUsNph2/DtLZp/aoa2z5afjOD3OJte0klT5kxuOtBhCErPSp] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: be723499-02f6-4410-97e0-08d9b80b9b8d x-ms-traffictypediagnostic: DM8P223MB0333: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: GxdQbkztvFHj4IlfCIt2m/BRRV2NFUbIKy+/kizILz+2rEHpxsDFKPF5e9g0Csu5cYlJgkxD1fFqfqC7NksmGyidNPnFYmOrDuCWhYgHOMtnzQRTlVf9bbrQcJSSXwbXfRjWBAp898r+pX/PnOt0M/fiDka2U+xcrgFuS3Es96RP89rfwNnEKPnG9sn8tCYBxXny/zQGrU3P2r9xGYFy6sRZ9zZbYnzCX+TrBAsEgcxDNBJyQ5bOoALkpmwh97kkSwgnysTohHEitC5PB4JmYji8FdXaCSOkvbMwZyNUaFWRNvx/6xQRBQID2BTfQZAKG5l7RazD4z5dd5IfOzv7Lm8IFyniN/Co9j0jnVoFfg8m4nrR2IqsEj0RwVt3deuL6AO4sgq3O/yVeHu7bfuKjcXqkTXHZ1ysj249l4aftrtO0Q6z+oapwwLMDqPxjba8CxserdYvHI9PjBbs8RiNFRA8KcD46qTyWmcXNTVDFMH075AURUzYrfPfs0PB4ilydwDANv/q95GoSj29A0IsOdk5SmLaVkpK3xNMZS6+TktOMPqtJCCFWCWAskS25gC7urd1ipl/wEG/Ig1nrpzupw== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?r6psRAAhWmkkglfIvn+/SoXmQsSC?= =?utf-8?q?xwmrVMwbJ5+hLFIF+xSGMUHK+OVuNbQEIolmi0K1C/8O8sHuTldi5uoM+g9EUn9PW?= =?utf-8?q?PeQ9SZZkaM63qLcoyJx+P0/OdkTJvuz7st7klPmpk0Ktc7UTKgSEx7oPgx4jqCqL5?= =?utf-8?q?/uZd3nRscSRTYrVzNXh/9F+jnnGSaqzZWrNejJkhl1OaJ3D8l3FM5lbRVmYh+08k6?= =?utf-8?q?AsQABqfqtq1xfu9ehTmWlvVq+d0rNhAZzWTYa6m7bUNrAr2xB3MNlrwdKUMaRVg+L?= =?utf-8?q?q5uYJc12/PZZSt5whVDETHUePnMgH9f6NNpEFgWPf9GEK7SrYeTQSjSJcUY8IlLaT?= =?utf-8?q?rLEI0b8PEvNi7Xx7BFiX5+WSfF2sFbnhyLTICjckm1ngpe9ua9w22Kv56raw8MEks?= =?utf-8?q?FXF0hz+3E/b8RGTx5ZsUPK2w0469XrHBKrWzcvqI/C6FDoZNp/yVgFtnambylUTWf?= =?utf-8?q?5Ax68ehWdhKP8XhKKaVyYfgu/GoAPyx0qVNjUBNZStWDguSErx/Sa5DkYGb7LqRJt?= =?utf-8?q?c9DFEF7emzKbZ03L1Pf9b7BGBSEiZVOOxfK19bvpwHLsE9z1X4eDCGe5QITuAfdn2?= =?utf-8?q?B2M5tu+45CkLi+pCMozSDAN2QvCZzVE+oHM97DsLTHazwyY2jOFyLOoqEQn08CbnB?= =?utf-8?q?jqvfVqce3Ghf39OjAVMVRFc3svJbcWXImoGQhzsoL5l/Sh4dnS97SaaTUtt1+30VL?= =?utf-8?q?K08H/3JiXU5z+2cHDq3DHwM7yYpyVYXaqtZ25NaEchDeg5r8yskkjBYLwZ07woZQU?= =?utf-8?q?p/qtvnqo0UrED6vr4Lx3a+a1ot0LTLHM9iKFkHU8CB6S/JB5KShoVBhpBnrVNVCGi?= =?utf-8?q?C7pGCK3HggQw2s/bzhKQRgtAHGJyLJwlDa8TZDu+ytQhy3RRUJrinucbutD0Bvjkm?= =?utf-8?q?+1UEpgXCDmld4ScT20BXU71uCJq34kgluEdpg1U7P7+8each0VVgfU3Q5dvbPbQN2?= =?utf-8?q?ruLsp/O2z4RZcXzsGc6ysSHbtmobXpkPtgyLd2pYAFQ=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-1ff67.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: be723499-02f6-4410-97e0-08d9b80b9b8d X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Dec 2021 16:23:44.3325 (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: DM8P223MB0333 Subject: [FFmpeg-devel] [PATCH v20 07/20] avcodec/subtitles: Replace deprecated enum values 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: dZ+LddOctFIn Signed-off-by: softworkz --- libavcodec/ass.h | 2 +- libavcodec/assdec.c | 2 +- libavcodec/dvbsubdec.c | 2 +- libavcodec/dvdsubdec.c | 2 +- libavcodec/dvdsubenc.c | 2 +- libavcodec/pgssubdec.c | 2 +- libavcodec/xsubdec.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/ass.h b/libavcodec/ass.h index 9c9cb01c8a..8e885b3ae2 100644 --- a/libavcodec/ass.h +++ b/libavcodec/ass.h @@ -82,7 +82,7 @@ static inline int avpriv_ass_add_rect(AVSubtitle *sub, const char *dialog, rects[sub->num_rects] = av_mallocz(sizeof(*rects[0])); if (!rects[sub->num_rects]) return AVERROR(ENOMEM); - rects[sub->num_rects]->type = SUBTITLE_ASS; + rects[sub->num_rects]->type = AV_SUBTITLE_FMT_ASS; ass_str = avpriv_ass_get_dialog(readorder, layer, style, speaker, dialog); if (!ass_str) return AVERROR(ENOMEM); diff --git a/libavcodec/assdec.c b/libavcodec/assdec.c index 7802a44e71..fd321e7004 100644 --- a/libavcodec/assdec.c +++ b/libavcodec/assdec.c @@ -54,7 +54,7 @@ static int ass_decode_frame(AVCodecContext *avctx, void *data, int *got_sub_ptr, if (!sub->rects[0]) return AVERROR(ENOMEM); sub->num_rects = 1; - sub->rects[0]->type = SUBTITLE_ASS; + sub->rects[0]->type = AV_SUBTITLE_FMT_ASS; sub->rects[0]->ass = av_strdup(avpkt->data); if (!sub->rects[0]->ass) return AVERROR(ENOMEM); diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index 81ccaf4c57..b13244c803 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -795,7 +795,7 @@ static int save_subtitle_set(AVCodecContext *avctx, AVSubtitle *sub, int *got_ou rect->w = region->width; rect->h = region->height; rect->nb_colors = (1 << region->depth); - rect->type = SUBTITLE_BITMAP; + rect->type = AV_SUBTITLE_FMT_BITMAP; rect->linesize[0] = region->width; clut = get_clut(ctx, region->clut); diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 52259f0730..b39b3d1838 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -406,7 +406,7 @@ static int decode_dvd_subtitles(DVDSubContext *ctx, AVSubtitle *sub_header, sub_header->rects[0]->y = y1; sub_header->rects[0]->w = w; sub_header->rects[0]->h = h; - sub_header->rects[0]->type = SUBTITLE_BITMAP; + sub_header->rects[0]->type = AV_SUBTITLE_FMT_BITMAP; sub_header->rects[0]->linesize[0] = w; sub_header->rects[0]->flags = is_menu ? AV_SUBTITLE_FLAG_FORCED : 0; } diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c index 4916410fc8..fbab88a992 100644 --- a/libavcodec/dvdsubenc.c +++ b/libavcodec/dvdsubenc.c @@ -273,7 +273,7 @@ static int encode_dvd_subtitles(AVCodecContext* avctx, AVPacket* avpkt, return AVERROR(EINVAL); for (i = 0; i < rects; i++) - if (frame->subtitle_areas[i]->type != SUBTITLE_BITMAP) { + if (frame->subtitle_areas[i]->type != AV_SUBTITLE_FMT_BITMAP) { av_log(avctx, AV_LOG_ERROR, "Bitmap subtitle required\n"); return AVERROR(EINVAL); } diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c index 388639a110..4829babb7c 100644 --- a/libavcodec/pgssubdec.c +++ b/libavcodec/pgssubdec.c @@ -539,7 +539,7 @@ static int display_end_segment(AVCodecContext *avctx, void *data, return AVERROR(ENOMEM); } sub->num_rects++; - sub->rects[i]->type = SUBTITLE_BITMAP; + sub->rects[i]->type = AV_SUBTITLE_FMT_BITMAP; /* Process bitmap */ object = find_object(ctx->presentation.objects[i].id, &ctx->objects); diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c index 979399bae6..5c9e65f737 100644 --- a/libavcodec/xsubdec.c +++ b/libavcodec/xsubdec.c @@ -107,7 +107,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_sub_ptr, } sub->rects[0]->x = x; sub->rects[0]->y = y; sub->rects[0]->w = w; sub->rects[0]->h = h; - sub->rects[0]->type = SUBTITLE_BITMAP; + sub->rects[0]->type = AV_SUBTITLE_FMT_BITMAP; sub->rects[0]->linesize[0] = w; sub->rects[0]->data[0] = av_malloc(w * h); sub->rects[0]->nb_colors = 4;