From patchwork Fri Dec 3 19:31:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soft Works X-Patchwork-Id: 31926 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1098276iog; Fri, 3 Dec 2021 11:33:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJyRJrWWWCjXaNCwT2Spj//HKDzC/R3zLqcnWf8l8qKy7x7yBOAoB2UL7LfW+QZ5VHJtDBSa X-Received: by 2002:aa7:df9a:: with SMTP id b26mr28245348edy.107.1638559995473; Fri, 03 Dec 2021 11:33:15 -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 qb30si6589408ejc.256.2021.12.03.11.33.15; Fri, 03 Dec 2021 11:33:15 -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=G3Pzyo9M; 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 4B12B68AE86; Fri, 3 Dec 2021 21:31:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10olkn2103.outbound.protection.outlook.com [40.92.42.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5223E68AE9D for ; Fri, 3 Dec 2021 21:31:31 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M48NV0fp+hAWUpbnWG7iYsmHarYuTy2+jVLLXQ9flckN4ZELCbV/IjUqLQkSPHPbZ2Wyz/Y+ZFvf7yPX66E4Zn8hxXJHzOtRp6pil08Ah5Xe5JO6Ac3/v2za7nSugwtL8Lc6ncgK40+1WbQiKLG4AQe12gjlYGWl/f+SwRxy9iBNBnF8WTMmoDEG3LukQnwjoWDl/WU48zkimhjvOth50/n1ybW6P1yHDR7WAtgF52G9w7uBpxIOrbzSfbv1OTkRiYRMW8aBq6SaVOa/pO0kmUFNBrIrJGEQs3aFzU/gUxkckJTs0MW3fL9jvAxdprnSvERuXlYdlc7C1CfIW/MYIA== 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=lNFhNqzvcdmo1XEjvdLPEAqONZrtUSNNDYa1yZ+sOhFOAB7rXIYE2LaGw09FPGcVptmta9uZjSAj43We6/RFjLdLxjMn2QARkf8t2QQbqRC4eBxlr72oKCvOo8NaT1QLeiMhFSdIUx5tMWMakvasra5zYVmep1ErL1z0PBQn3lPEhxABiJv/DsdHOuzXRqWYZ6PGO9bRdSYxNmSRCMTOq2TyyPagPIIm+Q3YnnnLJaPRCeQX5x+U+lPXoagI4Z5qDUVBNY6whdvczJXBdl5EwN1qRJeuJV6UQ1cMzBK2vejDkbixY+/dMsaFq7AM5UcgyerIgLSG7/V9sRCh/S40iA== 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=G3Pzyo9MEZVJOJKSocIH/1gjJZC6bXDfA0yiyOYYaDLzB+/AHPo31FmuRIobgIAYtb/nAIofC9mIu1JA61EK9CGUdLbtcwNBsM9LRBEBXbLqVWq3SzvlAqYbqmepjCoVrbGO7a7ZZDEW/8OVYoRZMxGBMBVmKYJ3BH3ol9wF5qW9ajLmVSH+C+0HGwGUM9F64Pq8A3JqNr3/VMQSwgQ94CRh4Kqzl3WetmnvjEudKz6QAXt7MBBMjalILS9cVNWr/BqAzFJAuTr/l2gjYRBJTMmZnDA4b0CdCAHPkx6FTLkpIIiutsIgs9YbfVaV+XbY7FT67BUSru+ZG+OGvykX5g== 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.4734.23; Fri, 3 Dec 2021 19:31:18 +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.016; Fri, 3 Dec 2021 19:31:18 +0000 From: Soft Works To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v19 07/20] avcodec/subtitles: Replace deprecated enum values Thread-Index: AQHX6HxXe3y3D+XS1UaQb+FAtRcEAA== Date: Fri, 3 Dec 2021 19:31:18 +0000 Message-ID: References: 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: [rIwT/bZNEM8JFNOcUoUvP7U9iZ/TQuuv] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 54c00306-e5b9-4681-f7a8-08d9b6937a7c x-ms-traffictypediagnostic: DM8P223MB0333: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: u2Q0bI+Ii+p5rKt52K/C6XLJVuTyaeGyJ908ee4W1Q+3G5KajVRwMfVYP5E8lj9RsyUWPIFdWiXxC8AzJFAi72sgeafQ17CwnKQRyOCrFJhFyDKR8SEQRoQjTc1neKY9dQipkjkEOLTyYfop7vCc/kv5g7zsdx9nieYU/z37OBBIpQpU3odN6/DE9+OOevNyja7EV08mVcAnQGlTnKzFwZhEwq0M8EYVWJTqrgPzqDH5a1w6IOQhSR7o7fYMRurRHhTDYmj4FKhXSfhbolAXkrOcIwoWJynccjiH5mCBAgirweNkEE9Uojrlo+MhIH4b1/Ak/7b3/mzdm64d+H1798dtcrYGX5vuN26GbRJySfxPU44D5qlqqJx7glV9vqQ+rXM5pZBXOvS1Gd3RftquvhVMTroChyB0Vbatmjmchg3JhB2J1od421t2TyiELNGd0JptV1DJPi5DvhtyOO+v3M503UhjZxmlGKSWTGxGkBEG6mBZNzrjxoCsm2g+h6HLRQ7498xJ1n8NHNONma2KfOXvq0B9iyxOktMtfqCmXyzfTeU44Ek0O4B/NLHcrJ3ZNELVigNENXI3pHqhKL3vHg== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?3ZwzhPgVhQBQqIYTaqRQqABKRdb8?= =?utf-8?q?64ecHqaXSXFDaLWZUrxfmVvCuVNaRZdFZ2GDnpn5OghzaJ77hxZx9clbquReRsVB1?= =?utf-8?q?VWOkdD6h0vFXVgudIRK1fR1jYi3T6YV+9ubsnUZ6EXVFH4/QB3ZewuIuM3heu/Ner?= =?utf-8?q?WJ15YeUVywAeFcMZFJHpS3tWmjak7vi4kXdc9WfN3Y1DC9dv6XAENTxnE6LFspJop?= =?utf-8?q?is7kdZMY6qVyXQvhYeYHpxRVpSn3+PpOQN+fL4EWIeq90foEreyNyuFeqPOAEsJ1u?= =?utf-8?q?3/03o2CurLsFRI0sjp/hwQ2HKcWRcSUDk4kcsO7YP2uUNnENsrBoXEoAAoFERkNvw?= =?utf-8?q?0HlhVJf34Nqi0FNG4XHqKBWpy8ewm9yi2tWFzhZ+vjtbiUQMsAK9NtUQtqI/zzwwq?= =?utf-8?q?byCqcpTrM0wdPOHcQBLXpezaWpcdU5jWRUpVER1WkByX76wnh13bt7ppKY5pv0Mpz?= =?utf-8?q?jZ+pURoPLpJjVUzDbxwldZpztUpHNAUREG8xaOqkxmG9egwAVL6PZpOW6pj9joLIH?= =?utf-8?q?KO+FjxoU0E5UzbalasDmvnvY45voPNcrlPezYYLlBYXlv9xcbaZfCieQPXZXEvxmw?= =?utf-8?q?nQs7E1tcbvf4vPPYcbhBYzy9iupUeULOID/CY3EKQxNbsSc85YCoy39wsKKKu2S7a?= =?utf-8?q?IAV44h++m784wvQ6UdDgL4Gxt41ZQkbPn1JZJxajS6OEiHzKUFlmqK20Mr5bFXbJo?= =?utf-8?q?9jrTjG1cGAqzhdgIsalzXMAFYbgCBuxeHxRu+YBzYris+ilMkl/Qu7BJ0MkNF41ka?= =?utf-8?q?XWSVf2RZl563Of4uxXCV0uu7Z+sQOBsKg2vBoKAZK27IBuxGI8ufTel6ckNme12is?= =?utf-8?q?eD/neGq8iInYELnkl2aA79MpKjkGasnAAEZHBShx6H9tUw5B3IGv8VM5/ZWA44T+I?= =?utf-8?q?noKf9SLn3mNsEi848rHR7xooX+qSWAEOl4Z/MwbLK2NQ=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: 54c00306-e5b9-4681-f7a8-08d9b6937a7c X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Dec 2021 19:31:18.0496 (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 v19 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: IDtFrFQkHh0J 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;