From patchwork Mon Dec 13 23:40:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 32458 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp6139734iog; Mon, 13 Dec 2021 15:41:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJzntOZCt6kuvPmeNOAXvgmLOMeA1sazrlY1N40tHHmg1WMZqc62rjHLVe7KbEShrZADfg4o X-Received: by 2002:a17:906:3a4a:: with SMTP id a10mr1586652ejf.253.1639438903038; Mon, 13 Dec 2021 15:41:43 -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 gm1si10342759ejc.26.2021.12.13.15.41.42; Mon, 13 Dec 2021 15:41:43 -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=XY7D4V0R; 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 D0D9868B0B0; Tue, 14 Dec 2021 01:40:43 +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-bn8nam12olkn2082.outbound.protection.outlook.com [40.92.21.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C31268B06D for ; Tue, 14 Dec 2021 01:40:35 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nJCRIQAUs65KaCZ/HJ4/q5xd60Jyycm1zFGeaTRjqLXEvSbKoJA2V+bJW3CFmVija0nBe+6MCOZgJiOGgpBozZ0ld1u0k7yywFx76GlvItKc60UxOYXlTYZ9wQmRkG+aI5kkHK+gRS8/0fz38YsFAn4GCoctH553iqMqU5JN7uIheiVY+9ZgdeR+m8AJrw1K4PXgIZc9unCw0pws3LXw4EXAXFEIfz2MfGCAUErWsoeVNBIQSFX7gX6BkELgCXUOW3KDg3tW3b4+Wethg+wyARt9VQDABZEcNmv+MJ1ZVkz8Ll+JjHBwKoT1eNjkR7xgYFSLUik4giv4Sjwov2TQXQ== 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=AGAwdMMwscv3WFG0O6epG0mo75eK4w3Mp2BIJR4bINjAY34Oppg/b6o9R8zmp4pFc9b7CycukS8hypV4oGn5hpyH/s+vbk2OWL4fz97uloxYF3e42fzZRNp9tbd2OQCgSA1CMM5s7CckrfLsF2EwsgK7DZRkWmvwTUbOXil48GZFBsr2xgkJYj1Ja3YBmRWlTwVQhUqQgB3iMdJdDgx/J8klOGXpUJwJvd+bqCBcZI5lQxtsoQupEgoTbWJK8FJIQs7qSlOIfzQoAQzHzYQ3pVsWsza7puIgNHD0+vqNcI7WTw2Ye6txKRy/txiwqMlHJ8BmX+GFTtlKif6kIjSGTg== 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=XY7D4V0RcN+wBhRUaePs6vcbT0GVgRDA7ciTS0wldmUgMXRH5ti0F8NoEKZauM4DCsyZEASN9jVDwb9xmnDRIg+nVrPTEbCfZa3QgRwMMj2LyRqFMN3+1cI9oN2KcVOpPAxDByDHsZcAX4MIlcuH03oJXI5ZS2+UWarEs8vLFH7UjQ9pB9RnvidkkaBQiYepN40+hWCbFqSz4OnM3sr3x1DBWMj0T9jnJEtBaLi01LqUsfSlpHyIpGDAUh4heG0lgggR+v3anUrvqkdBO+tyzwv6exL0yRavQahxNkgP05h7L1vD3li55tAcrkJlsgwvkTA5edUg96rWPap42kyxag== 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.4778.17; Mon, 13 Dec 2021 23:40:33 +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.018; Mon, 13 Dec 2021 23:40:33 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v24 07/21] avcodec/subtitles: Replace deprecated enum values Thread-Index: AQHX8HrSeRt0u+riXEeZZkV1Zpb//w== Date: Mon, 13 Dec 2021 23:40:33 +0000 Message-ID: References: <1ef42eb01b3627bbad539abd46206f320bb39697.1639438462.git.softworkz@hotmail.com> <4148d77a82d4b7e229fc81ce9bc1bc06904533f1.1639438462.git.softworkz@hotmail.com> <2ac798924ee984010d2e85f00bc992d9aa106171.1639438462.git.softworkz@hotmail.com> <300ea7188b331ca5e00dd7e04c03df8aba2a99c0.1639438462.git.softworkz@hotmail.com> <9474726b26f0d3e8f353d07caed2fbd33cdf473a.1639438462.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: [JYZnl6Yn8cdPUSDRx+iJKZmRTfl+HNsj] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 9d50175f-a268-4d6c-7995-08d9be91f4d0 x-ms-traffictypediagnostic: DM8P223MB0397:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: IWS03VzOBmLMmJ9sjcBW82W4l3ibS2G2QOItrn1/TGbp9qGRd9bQXCK2yp0tvd/lk5C2cCH5dPHENrFyQF0yKxRpQxiWTkP259ObrDcBHIkrgoNINghOH0UCYEqHCmYHw869TWrGHRK1do0lqvZPoE6xJBG4RPj/miyWpDWJWur8YNFkSmhxwoG0ucacRqJ7dO3WBP0AFNTM3P34qOXsHzQR00ytDqruDhtSQme5PdM3NosBGjRT7oXZB/QVH8HuhGYBYvXBsHb5sWbqpjcZ0h8cGiT2aqqkS0B9ZDFipQ2Q0M2e7Lacx1HTjhWi6ahOEQHomT606Y4Ed980RE06wom5wgh6/bIBdcj4J0x2wc71X3Snx7N3H1p0IXlryuQ/c+FSEhcIgk2P+QM5KwUkG+52XprOXZSjRkFMjdsckzlxaPNamx9IPLcAwD0vx+4+j2bbKayE61TQzGt4MmS2xqOZvO2WsLxmTNhGZAQmQyofMOwku3d6Dx+xRbQSlG7GK/IHhIZCrpMjD5pQ4CWEy2pDugGoAgEt1gzSvc+TkeSBP4Y5KzWndniH2EntzuMMFUfj86MZ7YA6ShIQJx9CtA== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?Ly5i3mTf0H7jdPuQQoKp3FtM4Pnr?= =?utf-8?q?mc7JzR3g3frI0npjqwvX/fl3hkQLV21LTeKky97U77GiIrtGvZXC/q7RN3VUXdki8?= =?utf-8?q?CXybNbhuqEdNDSZDNZoB7yEvzIf02VH4WHgNqYutvoGjze1U/Ehw4TILQuUueZpiX?= =?utf-8?q?ViBAiw34n4DJ57s635Ax3/mhkyqMhPdNAecg77qBZSluFbZgoZUgWaNy8higue+1k?= =?utf-8?q?DlgSBfhbS/HdJj5IvI8tYnIw9cY89mroiLBbPMbgwX8zcBiIjVjv0ad8EHnFYcdKe?= =?utf-8?q?e+bcn6jdJQ2/YJ3M/fY1E+BfhgvXo+a62CUFU089PcUyAzukFtGgTzLEmaItJl3AJ?= =?utf-8?q?zoS3jj4YZ79v/7AauIbrOAV5vTXNdFdbRWmlUVEGHBDUajs/huRcr3rxazEO6b6t+?= =?utf-8?q?ju9Gfxoo4uqN6hx6dKX9hHzyWeccQWfwATDrPyexdyubOaeNRDEV/byvFO6+j2vX9?= =?utf-8?q?oGr2AKpzbWj6YJ2Nh8xr7aIHNLVKgyGuV5QOMs9l/pBQl+cwsSCyCphN7f0S4KfXI?= =?utf-8?q?pZqns/C7JcpIG+UUX1DaO0YJOylCxaEDFNU+AUhIpcXVbv1JV18He4gVkqlOzyMiR?= =?utf-8?q?9XRopFtwepL0eNN0ZR2b0AquPqnu3LuIZbaELrfV/fvttzP5+BpE8YHHzgHMRNo0M?= =?utf-8?q?Zl/D1xxD5zp9fvdBBDVNWDyYL7bbolum0+ilMMvOok0Zu35Z9ImlCT1RUebgrF8rR?= =?utf-8?q?CGfN6GrKddujikK33WCc8S13KciYlW56IAFriA3lw5ComvUUHiIBRAT0hJbIQoDY/?= =?utf-8?q?H3a+odfCH84QVzBUe4FB+OeJxCmqnA7BvDnuc2OzmgGNQhab/99De2TH+2GDK4n9+?= =?utf-8?q?zx3F/UBVAWo4/BylXvoTZgk/ZT5OLAmZu3o6hXp8hI88ZNczRMSe8sUxaYaxVYSBy?= =?utf-8?q?UPkyHCJnr65I0aUfQi8U3aGk86YnaETm0tUZsoamx4kQ=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: 9d50175f-a268-4d6c-7995-08d9be91f4d0 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Dec 2021 23:40:33.6245 (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 v24 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: ZZISQm1XpVJI 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;