From patchwork Fri Dec 10 21:37:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 32270 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2373174iog; Fri, 10 Dec 2021 13:38:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJxmHiHbupXmPYV9obFCe9Tjypi0E52/V0H0Mq56Jn9VHaA6xk/uRhlbVgdbSlUQYt2xD9L+ X-Received: by 2002:a50:d74e:: with SMTP id i14mr41355455edj.243.1639172315207; Fri, 10 Dec 2021 13:38:35 -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 qw32si8214421ejc.13.2021.12.10.13.38.34; Fri, 10 Dec 2021 13:38:35 -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=rGHgEMPq; 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 EB7FD68AF37; Fri, 10 Dec 2021 23:37:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12olkn2098.outbound.protection.outlook.com [40.92.21.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B77C68AF32 for ; Fri, 10 Dec 2021 23:37:29 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=khTlQEuS3aPH3AAzYqB9ulJg/xj7WvkB6bpb9QPw5DDe4F06iXseqcbX9yNEnycbAe5n068ZmHHDod3eSqLfHuFpuSWyDUoCvXVN8SCltcSioZphiZPbzR/WCRIz5v0PyZ20LOCWyiPj7bWMhk0a5DyeV1bqPpwmx7GMT9hCrCYzqHfccPnsYHZOQBBE7JMF4yKhhJD7O5tF9mle7JyRv1K9hBOZfZ85L103CEFDtjlf0HyyyyvdU7FFIHzA5ZdlmccEC5R/IrmwehMj4dHbsP5U7oX9P/MqGPzRNxdNZFv5kyMNgwMSxZuVZHoosjngzyW+P/CHFOrnC2KY4LD//g== 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=ZzpQ6U9H0LQ8jDH62lnqffVGbc3us46qzxPmNhPDLbtH0sJCgAqxzY3+izz4IFLt9GtDeLKZsS+JhwUt0Kk7q4VXvmhusNL5dIoKG8cRI+DWbrFH4I1fbCdmUkU5+Pm9R396xkGpee9j28nx3P7Ivm/Atym3TWn3HrD5zCr+9N3NA0Wlcp4yJt7SdDYAQRS3sgcVHcu2iMasohxqkrs62vd/5Z8dnC4TOJqcMrB/+AwBUz+Wrb/Opr/Fz1pyF+bYAN7pA2CJJ2xBRzjYr1vYBiG3bebVT0hI6AAZOcKxaGkZnQ3Qbud4ii5DWp6dpdJ4qZTAIHACVRmaoZzQMu5+kQ== 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=rGHgEMPqCQGizOMd9tBsXVXLM/2oe69kDH3hLm1q6PTHnDR6D6J0JxmX46/T/EoSGZlEkcJtij/c2/njJPL4kK0SSLO8L/7pL+bfA3zp4jNxT164Nh+VZv1BhWcYUCZw5DuNIHhuPnOoUmMIV47d0TG0z5dxws7eyxnFZtOynyhD0CrhihjeKetZTDbZAXJ0O/32JZF0rKHTZxUkHmn0dkWgT9M2TQbXTH9uM/kS0Udgo7jX7wPZyG6s5NCmcQRMg0dUd31GuJ36do7OyC/B80qyj/qPM/DoX+xyjrrAQuloBh1UQDzf4bpTCBVv1Zg8khfXPnMLhyNJQPSaHfvhpA== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0397.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.20; Fri, 10 Dec 2021 21:37:27 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::9c8d:fc63:9488:9775%7]) with mapi id 15.20.4778.015; Fri, 10 Dec 2021 21:37:27 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v23 07/21] avcodec/subtitles: Replace deprecated enum values Thread-Index: AQHX7g4gWzxNZ4R7+Ea/SX8cUFv0uw== Date: Fri, 10 Dec 2021 21:37:27 +0000 Message-ID: References: <84c6ba3b99bf387e818d59f2161009ead8fb5767.1639172095.git.softworkz@hotmail.com> <0b41271ed30b530c1d55a9b824fc8bbbbd14fe5e.1639172095.git.softworkz@hotmail.com> <9f2875d043147119351f59b6410d718d170574e1.1639172095.git.softworkz@hotmail.com> <62a926e2d86310039653324bdf2a856f09a0fb46.1639172095.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: [6JNfzz3MHXfWv8BLkxIEuuRdN9uBY6qT] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d86564b4-07f7-4255-d0a5-08d9bc254301 x-ms-traffictypediagnostic: DM8P223MB0397:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 2kCXVppQ3j6T87407cfs1LaWNd8WdWJ71zflyWQ2LaBaQPRm9WCOx+M35Lp20LXabHdaGfLZF/LPjyok5iFjHWcpWjtfSyPGqcS8zlGNWh/O66dXaCg4kHBNce9p166cWUVxZbut7MXNIEAbCc7nqLoVeW1FTJU6lXHd8jrFjWPmaupHJyyTVwlWzTlE4L+vY2vy/N8W+Xn4LAfOz0+I3NJBSCnhvGexJTHYR7QnNypOiqvuVnACpUiWR4zkvE7HqHsNMIHqR9G7qMUcU1HPouGkW26yHNdrLm/g+0d+MWSVyaKIfqDT9mGyQcEAE4PteT4of2Se0qkdLMoXjTHTjuf2Uxd1B/ey5k5/lMpfqgfpmY6CfTLeFtgtgfVLqXcv/KGNylHY6xqisJ9Sa/WukEOsxfl4Erhfh8Sj48jssBe2dt3yWpKJmg4TQcvfRDLJFlMFB+zRWtRbzU5MmJUvxTT8l2VjODwWOTT52SPV46kjPE0Ah0PP274UtMcAGCHICXnMIhvyhkM70HsvL74839IlUTf0+QDD1Exzri0GtI82Asow2R3vaqpW+cFF75HUApric5KmUzIW5BbU7Jx7rA== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?VJ5xJWpa4lgWeRw9PJOm0j+0A058?= =?utf-8?q?3EpgxPmNnq8xi/Zr47BxPaojE6fn//OAH1EKQMDU3Wh47jojZTvTcAkUYpxHVII9P?= =?utf-8?q?PMmuoSI7DjfnVlk5gama5cCbtl3eFTYt9N4pHVSIvzgCXCFmifyiRdzmUSyKS9CtP?= =?utf-8?q?fwn3LBB8QC5jONZ2QpYzXMkdw88sOmlFm7Pt6HRd1LomXOJTY6Mat6/ypvLuGVul5?= =?utf-8?q?pXPu6LLglvC3HN8W5TGt5+ONHT4sGT29Sih//A1FXouMP+1Ave3XNbNeluNLxSii5?= =?utf-8?q?SMCqeXscFvPBeF4Mpl2oX3WyDJ+0q+YbD0jBbcrfStGYfAg6uCrJNRiYoj9dxStBX?= =?utf-8?q?oiQqgYxPf7tI+BnK5e3utMGllYKoEMOPReCMCAEzq8Bw++IM9Zc7QWRgC6tp7o+uw?= =?utf-8?q?ALWigcBFxx30tKse6HSl+zZRGxw57HSjpMLsS18FiG1kW5ZMMpZeL9T1cS6FKHJPw?= =?utf-8?q?TbtThXfWSd6anpWDxiK15c0ur7fD9V5RU3pQCHmC8joj6354gOgzYrVUWmRmlW53U?= =?utf-8?q?dbaRqH1B3aRtbxJ3MUvgUSbUCswcfMs8xaDSWbZZnr3uH8SbLbhgVMEflBqhHK62K?= =?utf-8?q?Qh8Nijl3ghsZkZ7eCgNJnq+vX/jAA9lEcKbCbBuC7YWMgcm3jSrOqWKoQgNm1DM46?= =?utf-8?q?7s5v7EM3AHxN+7Tt3fvLUaaCRyEMDl4GmukrYD7OwzqoXj4zxGww/76KDCWzH9TAn?= =?utf-8?q?JLb7rvypmxuGbvNdOilFloYRiiTOgY89Ye5IQypeHu3MgYrudJ2aQOSiwLUzPWRg2?= =?utf-8?q?LBAwdYUDzpFR/HC1BncDEKL19Ad3DPr/VWhq6ETsiE7prBOHxsj0ckKcpYKOFfvjD?= =?utf-8?q?2JMBtlmuXcQ3eNvITxx8gt4KviAQojy9BYkmaDMXAwY3PtjIjfokl1sBRrwThNrD7?= =?utf-8?q?QBe8zExPLOCe7q1xC8ZgVUaIoQyC8wcr8Q/tqX7Yofng=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: d86564b4-07f7-4255-d0a5-08d9bc254301 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Dec 2021 21:37:27.3172 (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: DM8P223MB0397 Subject: [FFmpeg-devel] [PATCH v23 07/21] 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: JN/vNwzxf6p6 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;