From patchwork Thu Jan 20 03:25:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 33706 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5432446iog; Wed, 19 Jan 2022 19:27:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJwEyv48NRMiGFgiu+YRGnQMCLNDXwc1QirU1HXDknFkJH96gZ11GoCLP1VYfg6QDTz3F02R X-Received: by 2002:a17:906:175b:: with SMTP id d27mr27556827eje.476.1642649231427; Wed, 19 Jan 2022 19:27:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642649231; cv=none; d=google.com; s=arc-20160816; b=cCfxBKAp4vcigYwiLnJzZ4vDRiIFoj1IUxW8YpwI3SNVe9k3Ay8ROHBe4L0uH0/y0v sRJHkadGOyfjhN2x6dB02685jiDqcSKxVMaXCaYHMXylMj7sgj4I0p8DwWpkbCwdR16Q cCE7uunBYL2boPbrDV2GY3Evb3x2SH0zIst8wB9FjyuxYUt4lm73j53GcJhWbLgztp1z cGQDv0hFbAOGLDqHRibn/xsYTghb14w2URieS/scspJmU3bIbMoxjLlXl6PDOPXnwZ0R 7ZvSZhJuLNCIhtYY06L3OiVQqRoxbepLhuLOvAUIlkbwhGeIvbdRGIUciIIToLBdKqhL fEMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:from:references :in-reply-to:message-id:dkim-signature:delivered-to; bh=QrwIH3YK7Wk9uWaJ6E/aH/FGcOQ4PdIBC2NKsbwdJEk=; b=skJsNFV39Xvj/uB1EO2YEU4AOoJljgZTUmwrILOe71qjRlDHuWNbUYJZ00FDXi77YV DLQTsugpwx5WFvlLT//Rt60eFyRCgSdV08+LcU8wWqh5/AYaew+MODI3s78acO6MxDIy 8l/XisM71TaPa1jAFdo5GC3RUCQU3v2qtp9Zkp9CbMHapkkm3OBGAmjc44OpEolqs9WE 9gCi38F5jxGIsmfBDoS8EZVPShqQrgwElkq4BE8kXnrEG4fQXB3uta0Whjm3cjLYFwvm XDS7UyX9C5kBG+YHUgBtlnLwcsKOqDUXFGrvA09DYlxdLfGiEOv1sB51DQ7V+lQJWRey nD4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=poMg2pFk; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h20si1330740edb.418.2022.01.19.19.27.11; Wed, 19 Jan 2022 19:27:11 -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=@gmail.com header.s=20210112 header.b=poMg2pFk; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C020F68B2BA; Thu, 20 Jan 2022 05:25:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B61668B28C for ; Thu, 20 Jan 2022 05:25:43 +0200 (EET) Received: by mail-pl1-f170.google.com with SMTP id e8so4054955plh.8 for ; Wed, 19 Jan 2022 19:25:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=tP7U9aqZZpiD4YqVHm3brflrusuR3ekpb3goVhG2dbM=; b=poMg2pFk2QMBui0I4wfrb8GZJDxSLqxhhEsUIDv69uuNj23VvG4ZWKe7AR+PC7RvvP CHzEP7OSZM5woPGrld58uD4u8AupEh9KUAeLky4BCX4tdO2YFFfHBMelEDP4fyugmVjM 4twnb+Lk0byO2C51RKAltj57aE8/al7u45kCBuLfGJq69vuYPt2lgztnbeuu8bAJAVQA YZyYS503wV2Al4+cXzTVdqFQYv8/ieJhF0yfWDg1ORlVp49HxtU8SVCZFsDYWp5FjtTv JwoieET8kzW3DleCHHzaWvfrotfXqZkkdjtuUFuh0mY5x20YbIlFyaA3tkVDUQ/0RaVC ILMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=tP7U9aqZZpiD4YqVHm3brflrusuR3ekpb3goVhG2dbM=; b=lVzeR0eGIsSmHWRaXliKQbedhdaFdEGWj/yYeD2Bchq+cEfoztrXyUXJqG5XEDgn7h QDREdViF8lgh0ISWwMVwI+Xm+L6FPzEG2kOAKgj+dWKIE3Byc3XlULg1sNTtjToONkfd jSpG2k+ZgpSqm9I1OPrj2ZwwBJEXsOjr2V1sw/MGDdJEhOxX5CYzf3k0jKcbhW8AHBAV 9KYy/RCXnJXL7oInQtqZlb272pXMmM0A1F0/f6I2xO7kD1gZoyeDizuTHek4kYJ+XnBa KUqvon03wVW6at32CGDqkVaNOJ+A4WPvx47uGScXjh5GRKoZuF4G4qRt9oaNNzsuyURS AFGw== X-Gm-Message-State: AOAM530948nU8S/3S4Afx8OgR3KujFWaYTUShaVUPmCF5FT/k4+5/2pT tefPYw/b6oUxv3uKGV28NdChJ1qXgUE= X-Received: by 2002:a17:902:ce8b:b0:14a:ff2b:77b9 with SMTP id f11-20020a170902ce8b00b0014aff2b77b9mr3471256plg.132.1642649142079; Wed, 19 Jan 2022 19:25:42 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id j20sm939781pfj.218.2022.01.19.19.25.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jan 2022 19:25:41 -0800 (PST) Message-Id: In-Reply-To: References: From: ffmpegagent Date: Thu, 20 Jan 2022 03:25:14 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v3 06/26] 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 Cc: Michael Niedermayer , softworkz , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: w4wssN3Af15f From: softworkz 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 8bc13d7ab8..43c5ad651a 100644 --- a/libavcodec/ass.h +++ b/libavcodec/ass.h @@ -83,7 +83,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 bc741a1de6..0d64c6e71c 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 ff4fbed39d..943a7466d9 100644 --- a/libavcodec/dvdsubenc.c +++ b/libavcodec/dvdsubenc.c @@ -268,7 +268,7 @@ static int encode_dvd_subtitles(AVCodecContext *avctx, if (rects == 0 || !h->rects) return AVERROR(EINVAL); for (i = 0; i < rects; i++) - if (h->rects[i]->type != SUBTITLE_BITMAP) { + if (h->rects[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 bdd20c914b..22b6616f9b 100644 --- a/libavcodec/pgssubdec.c +++ b/libavcodec/pgssubdec.c @@ -535,7 +535,7 @@ static int display_end_segment(AVCodecContext *avctx, void *data, if (!rect) return AVERROR(ENOMEM); sub->rects[sub->num_rects++] = rect; - rect->type = SUBTITLE_BITMAP; + rect->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 85cd7d1c20..a4be18a1d8 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->num_rects = 1; rect->x = x; rect->y = y; rect->w = w; rect->h = h; - rect->type = SUBTITLE_BITMAP; + rect->type = AV_SUBTITLE_FMT_BITMAP; rect->linesize[0] = w; rect->data[0] = av_malloc(w * h); rect->nb_colors = 4;