From patchwork Thu Dec 9 12:12: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: 32229 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp275543iog; Thu, 9 Dec 2021 04:14:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJxrrY/pBgIcR5xDNkOt12N9+4RB7soIkUR4wuvTwhv5NG6TZYOh9OynAVwdnzhWYuvP1Ycg X-Received: by 2002:a50:9514:: with SMTP id u20mr27962283eda.117.1639052047035; Thu, 09 Dec 2021 04:14:07 -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 u7si10100770edp.340.2021.12.09.04.14.06; Thu, 09 Dec 2021 04:14:07 -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=X8OOg0qF; 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 BE92668AF51; Thu, 9 Dec 2021 14:12:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10olkn2041.outbound.protection.outlook.com [40.92.40.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F2C8068AF21 for ; Thu, 9 Dec 2021 14:12:47 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hQV2cdNd5e7eVts1sNovrEDPLxX8J7/LzWYESUg7r/TgZUm2tgv+uIQ/8hPam99n6qvlNW4kO+MV5Wmpu2eNgDwoi4mSCR3EhdQfNRSeRmzgzOd3XHuAV2A2k8nOT90fZmnDzjqqyxBaPjBgZ9o9+LYTtFUc8dns+z9exWU7DoXss9iEyYylPXW8gcvo5yAUly4NNuSL7E7cS0IEUBXswP7uAPju42hEtKmMO6dHF9qRiyvwNXuy7VQBfW7xG2UuQWLOGlEam3cstc7dWIVYy2PRtaJhDLaxPQEjgsawCW1zp/maKre1ds1OedtFUCtv5ShczJ1Js941T2MS1VpMiA== 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=FBAg84tF1yDLw9qiT75ygQ89LtIVAJnWBkYChZHidVtAP/TJ/RshfIaStlT7rGY/5nNjbShRMjWen0bcQFVIZfJ9I5McR6myjNu8dCkAZqJrYqmZxwiApch1FtFNqCDWyL7DBPZUx7kFaAANp39BivuzCx41HJw8h2nDw/3dPqFcPfOezUP/vbmMTj1oXe0/h7SxUcrPuBCO3DJ/RugvgXauesLtIRBG1NAvEQ5mzOOpdtkkk+xt2h+V2nYcz3XDYonNmKQmMyFvdxGnEDz/DeOpTczI/InNrAVGwlR/UzjBR4QWY2dSGohwXzc0OK4WHrg+iR+VEer3eXNafDgPGA== 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=X8OOg0qFjw6UPiqi5dPDR4EkQActhCa72yW1T/FfMEdclS1r5nYMZV0jMFBCFHQROBcA5lcrdSBLmyV9z3GtvOL2Z7xk8NuAbrnDTDgagL1QgK7fxFk62EARbHbFrRjmF/OnPJVtlvDY5ZHnYKI+w7cE3viP4+5JsI/4q0lJBlkHbv1PThlB1UjYXxJ/UnaOtF4jzIRnd5XGPgCSWBAI5qTrajhHD9Wyef3gAlT2hKH5WyLQ76efJHpexxUIwN5Mt2BmHo0IqZbPipasIKgXoWx2TGouFgSCA62bN0qDrQFvjr4Bwyugf2/79bFKSBfS73Wt2NkJUejS3Zu0xzN+Wg== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0399.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:8::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Thu, 9 Dec 2021 12:12: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.025; Thu, 9 Dec 2021 12:12:40 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v22 07/23] avcodec/subtitles: Replace deprecated enum values Thread-Index: AQHX7PYQBmfqP2MFmEiqsDJCaRYNjQ== Date: Thu, 9 Dec 2021 12:12:40 +0000 Message-ID: References: <05fff8a8e41014ff699b57bd805f0411865328af.1639051681.git.softworkz@hotmail.com> <18ca2f636f4ef69cbd1b146fe2b3384e242bc377.1639051681.git.softworkz@hotmail.com> <3f3d922baa2061dc8a4e4243c2fcd9813e59ebc3.1639051681.git.softworkz@hotmail.com> In-Reply-To: <3f3d922baa2061dc8a4e4243c2fcd9813e59ebc3.1639051681.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: [mJ6W26HydHfcOqCUWKCys5AJ1l1OJwqR] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 30c9e4cb-e1fb-4ded-d8dc-08d9bb0d32af x-ms-traffictypediagnostic: DM8P223MB0399:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: VmurYjs8BwhXnP63JQAvoaeM8I3qIfjlMbbhQ6ksZJC0HYtVvqCaExSYty5vXw6fRkn2Zs4Ib1NofiflBAxS37mh9sWxyUxmNBNwDO83dhqXhEuATcpQaVNDQFB6kPVxxIE+Sd1WHdOSKvbhzRKbTDJ3PtZlJmSoX4GapBGW+QO24awWNOOAKL9KDy88HpED8L7oy6vPfWr/azpdPxz97HgBmgFGRRnHvO4sfOfVXp/1jsoRSlpz6bNHqoUmAt/9vKviQh/Yt/QMlawm8KcGo/iovvPQOAmXQWNW4CbHiIWsrrYr2qUkTddJl3ogSlRvR6iWO1Y8XWMnT0KuA12c1lPHxWdyQqmj8iu7pj/oiChe7mCp1Ja1s9GDN2mRyhbN4nNdOOqZM82binY6xwnSgpazK2OviM6mAWtwMYBg4XGsRk8yFabk872CzV5hD1VkJW1WC2l67gmUWMArJGHftOR5ySP3N6nTPUekMdJz+JPTLuMMA9GOLB6c7Yd81ph90fzzny5dh4Ew7q8lU2rcYzL2s4wDCqS1raCl9aUbyfYUmi45r+hY3Msvb01npL6QkCPLm/Fn6vwUJ9b6+MPoPA== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?+0RUCDcGjehtWwG/hsdKGjd1vM1Y?= =?utf-8?q?rJ/nPyg30+ekOQ9QraGsiUOyI/6Mv9EaBdmeCGtD64naMbu7AAt5nn8pBJRPcFZvx?= =?utf-8?q?LfXEizJebv5vV1YP8Gw3ZcNXMtfUfynwMeC0xNy0MCHM8yQEtm7c6GtV2liCDC39t?= =?utf-8?q?p4cx9lBNkGRuQlyv/noo29TQ0dqJvHGKkvn5/Oa/f9Y3SOC5+tVeHR5UU54u7ZBC/?= =?utf-8?q?vw0TZK+nt6+d11mN2N0Jl5JGKLa8/Gna6hejILTNJN5GMcHkltRTTD/ib4tkJUhtm?= =?utf-8?q?0pCEV4qMCyxRqLWGGcYgQp4luAfZ+wly3drKw62OxRxdB/x86eYTGN3jtXbwP7Np7?= =?utf-8?q?JwR++Oa5ZJuFmvct57mMSj99aqi9PWpGWldMF7rgWPNpL/QenY8J4e6smQ+cw+d28?= =?utf-8?q?kTwrivXrxGbXkCDxA5eyVt5KAZv6s5zqMJX27rQZYo1zpF8tBqp4BfWpvF9A/q+sZ?= =?utf-8?q?TM9/9nLkmBe9x0VdSpzIIjB8yxTNFWaHwZfdQ86qjgaONy1P5hI5beV88lm6BwSJ0?= =?utf-8?q?RTAUlKDUzfN4UldDxi5/PPXAsERZnHbEvjDkeOmkjnCQHRSx0blJ0ijErVnn5UMsa?= =?utf-8?q?f9G/DAAfZKYGZdyUkKt9hLYCFbxURDgeMm6yokAj2MJvxXiTv+zVDBN+uYQ/B2tu3?= =?utf-8?q?BHa3+wYJSDiH/gBvciLgK2HjCHr25F44CA7X8x0rs68KZBpHdmQhrJRvhk4LgbY+l?= =?utf-8?q?EeSCxKeBXX1rqELjRZLFoS0fHhtrkYZkSzem7bAbhdO9RgTSOhv6BgHYGmshWftxR?= =?utf-8?q?0jBVr2ajXozf/ExjZ7gnh7KoCBt594ro46wgmvYMtDLPsFHrgvaNKQW8bymQiZLbB?= =?utf-8?q?YHkdnHVc1C1IfHI8rxeEKulHHRdYx+0IZ7q+J+c5EeX4Z4sj+dqwy9eOmDTUH3cl4?= =?utf-8?q?ShjOM61bhrAx3fsZpBDUz+aIGenI9q6eDdkyLDsJzW2A=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: 30c9e4cb-e1fb-4ded-d8dc-08d9bb0d32af X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Dec 2021 12:12:40.8223 (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: DM8P223MB0399 Subject: [FFmpeg-devel] [PATCH v22 07/23] 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: DsfiAZbDVCxS 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;