From patchwork Sun Dec 5 19:41:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 32018 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3628018iog; Sun, 5 Dec 2021 11:42:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJw8SYGk062fWZC3o+i9qr+U6t+WnSb7twGIvhgj9Dp+Myg61fp/Ec1Q8zqrSfq/hGbajUrA X-Received: by 2002:a17:906:7955:: with SMTP id l21mr41771383ejo.6.1638733352990; Sun, 05 Dec 2021 11:42:32 -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 z1si15622189edp.452.2021.12.05.11.42.32; Sun, 05 Dec 2021 11:42:32 -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="EXv/qbLT"; 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 C259668AF81; Sun, 5 Dec 2021 21:41:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10olkn2093.outbound.protection.outlook.com [40.92.41.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9071E68AEEC for ; Sun, 5 Dec 2021 21:41:45 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SCRjN+GROGyPO9XSAMezXMLGqy8QqashRCQnQaGFowydpJxvlmcbD3g9tbMClwj6L2DfF5twqcEos7hT/dqBv8Sg7SZwLxGFfLeFHjuoQVt7BVEQB+ugGfYEkI8z+Yad0/NMzRFhLlN1qIFMhUJFk16PkdhCM4UnPwOohnlux/+zAlayLNFbfrIbDu9Ra7yPsGcQqIEsYgV+yOjtsYMo5+S649pQRunQfRsHgScBlFpA5tO/ELQmN95ofhYZNfRrjXZHHO6mX4UK++nxR1+xO2znJgmZDBcDKPcO+5CDW8zZ8OgoOCJan/m+wNx71Et05ztobYPIoFVVPh6e8TJoAg== 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=UMa2PjO/aeVpezexsBCwLJjUbj51j67u2vK7jCMm3OJjepAMbdksKx/YF32mKxGd26l2iqSStLppqfhTVLycT/5lRkPP51U/bN/IbS6saKlP3KvEGFAp+dSt8eNeoooV5c8E7vMfityJFQdS31AdQH5zi8iG0Ev59qIllsbnc4wkdL10iVO/BfbGkdZsD+Wk2GU+6uVFn7iPSxGJp7GP04wA/dZ/CP8Id3qpIU2/AbQbXUdyxkw5u5ZM4bAgzX/1RDoVme0Lk334uW7RMe+ppE+66PXlo94cZLxOp4kYGu7TzsgZ0uxfd6ApeiTskhjXo5n5beB1sIwBmCzmu3PrEA== 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=EXv/qbLT8CKz6lubJw5V3iGQMlIbvOWp29PlID+w3knIE55QBEustEhJ5SH5SIueYeitrOvzGmNnOjnAVNKe4n3J+smUPxFdFdH4PVzISMfYDvjgAvNjga31OFzqHGZnhBQcwrqqZua4Pgelgk+U3K8b4aPcFQOUrsJ1IVbsc0sZk0FTFXFlp0hgOzODwJEoU1RRKC58OdvzHYlwh8/VBfdPX6ijzRvOk+Uusx9L+K3/ADPiqz/fJGVSynb9hgqGluAV5vI9sIDbzVMWbMGr/IRO2hXcoa82Hl3klehhKZz1ABWtGyNi69I1A+rrIs92IdNSmtTN5ARiTDVl1un82Q== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0320.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8::20) 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 19:41:40 +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 19:41:40 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v21 07/20] avcodec/subtitles: Replace deprecated enum values Thread-Index: AQHX6hAfzPYgfxXDAkiFlroa46WqWg== Date: Sun, 5 Dec 2021 19:41:40 +0000 Message-ID: References: <1bdaf4de8cf369e4a28e7a5d8be2870ea5e34b39.1638733198.git.softworkz@hotmail.com> <9fdc2f3e9bedd2ade341e81095496866d786488b.1638733198.git.softworkz@hotmail.com> <9189c7c58671e4d611b5a7f44c9db4b37416088c.1638733198.git.softworkz@hotmail.com> <3ce4c329dfd8718fb86f61ee73b044f1a3285486.1638733198.git.softworkz@hotmail.com> <8e26ae0f796a7c9be3aa94740b68a7fa9400dafc.1638733198.git.softworkz@hotmail.com> In-Reply-To: <8e26ae0f796a7c9be3aa94740b68a7fa9400dafc.1638733198.git.softworkz@hotmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [4nEGiMfZBJtsLOdJ8zg4bmCRNxAoSggxWGvh5P+qgggCVuT8CfHS98KRN/1QY4Ix] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 460937c1-c053-4151-3ac2-08d9b8274214 x-ms-traffictypediagnostic: DM8P223MB0320: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 7Zf7Yl8glc8VCMM3uWxX9h67iWtwShGWDlzxOkQ4azto6PZexP6Pp/O6ox0H2DTYTHUD4BHFLWzgXQH6+DUK7m0wf0wmGkeWOHuoMaGCVSeLG5Cm2INsaU90b5gQmwUAvwK6+stggJ6ABvw8hOsg5Ana0YNWWHblUgDdScTMPmnGH0D8X43Jk4ZOewIel5ESYwRxoEPByQ+EG+Qm27X5jgEABfntebM7Yqi3yyKKk5oJbojrd+rztBwwWQ7VryOFrYx9TInjCa9HxRnbm1j8+S9pf469Wo2D7jAEaFGmgiS/mpoFX1sLWRMDufz3d91iYUkkMFLr2Dsw7JIp/vG/VZ/fQLuPE26WHMllF5NwprBwrJ2HLKZewmZyOU2Hs0w9A1wS5PIdIq7yAs3Ak5/gErSvqDYRKtvwnAEdCsyMixqtq48UB9rdr9b1Awz4iIUlg67iX57pC1esNSVHrRrSVG5desRUTXbN1R/PioDDlD5LRKUeA02k4w47jw1bgtZNom/E3heDxeqSB5VUdz2ZSXtethLkLCdJnoIcixUFinfsVAkp4HPoUoaAUTb9RqzQTXYDZcZINQXEQrFksrghng== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?cdiPaHUuWiJCYhj4rVue0mBr1fPA?= =?utf-8?q?G3cVE0AytlkQCAVe0FVlKzCtIvVIy4q7Ontzizd1Dy+fYIqIN3hRa4gIHDYpZrJlu?= =?utf-8?q?WId0mNctsMDGgjI0sCF2aCGE1T1hxX3cn+RDwrvr829RUlVe5gTOb6L8hYhYJ83kY?= =?utf-8?q?+Ll6MPHoqCvCDyuJUO2Ac5kWRtAwhV/Nsgnwvx02ynUjmOOPeo8POqm7DuLICfm3P?= =?utf-8?q?kolDd4sIPkrI7rJdBzCRVl5e5q0axsJY9qB2bRnja/38sC5ehiIpVHuI0OiBORYll?= =?utf-8?q?eHGosoxWoL+m0oekVmEAv/gyFrL5nRdSSCh17IjlNPdi6I2yU/BniceF8Tcpkcc5Z?= =?utf-8?q?c54fIg8PkatwUjfZb0ScedDHaigtB5D4XlKcLD04FMpDVMmZLPZA6hQgf0M9y/WGJ?= =?utf-8?q?zVUDKMCB5zatALYtUj851BdtDTZ8O+e0CUxej4kqAMAkF0AK0C74Vs7R9dxPM2GKv?= =?utf-8?q?7HgYzT6/njAZZwt9giYt78s9t2iK3n1G2hMfwQ1sFaZApxRI0ZuKzpdXSnAPronxo?= =?utf-8?q?OotLoKRSLUNJ6g/zvfBRN19CF4TozB9hZ9DrnjF+PMtjwtPzlUxNe0lrCg2/9MAEj?= =?utf-8?q?7ETYsZpLtjBiRBHiv9L15GWsHPOdG34/uOQnTUe5/nOvhZxy6JvW0ltPIvn9YK584?= =?utf-8?q?eOUGXkBFbMUR2C0/UuYjs8tIXAyb0omVKC6EwqWKDkG0PDuvQykFNrOpIYxQw0FwD?= =?utf-8?q?KoIa2oQnTxhnTltQSEMaEnpBXUkY+ZKoVRtQnGUmdoKW+OhlD1zAFxJzo8S5W3SAf?= =?utf-8?q?Vs/JdkNwunZ4wqHE6UatkRIz1CBFtUSMV+Nin/7Hu6zgY+9ozua3yDChYyZORd5CU?= =?utf-8?q?wZs/eg6QMuSG6A1Apb+4degtR6SEDNFc3ArPhbQEw0NWZpi+rIGmnRuszKcpCq8d7?= =?utf-8?q?db4OElABjuvHQtwlf4mrxv+6ZadCnv8F4mRTILzhbY1A/zrYg1NtpJL71QGbL0yp7?= =?utf-8?q?mc68T12KM5NsAApPp/hzVy4iVs7N8YHAq1tO8cHEiQw=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: 460937c1-c053-4151-3ac2-08d9b8274214 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Dec 2021 19:41:40.0736 (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: DM8P223MB0320 Subject: [FFmpeg-devel] [PATCH v21 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: VJ/2mHSePkWp 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;