From patchwork Sat May 28 13:25:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35965 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp1366340pzj; Sat, 28 May 2022 06:27:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwK4O5amZBmL9HePsNMFaL46EIpv3fKvJ6rM+VkCK7uCB8FwOCdy/UtSMGNHKXGibq1V7jF X-Received: by 2002:aa7:cad4:0:b0:428:715f:5ce4 with SMTP id l20-20020aa7cad4000000b00428715f5ce4mr50994829edt.124.1653744439341; Sat, 28 May 2022 06:27:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653744439; cv=none; d=google.com; s=arc-20160816; b=yNhCiWD5XCQNO2kjd1mEBVUsFnFuLEMOE4azg0V5OUI1+P/AeMucPqjz9/mXohQNCb S8pBtXDyu9vVDaBWGBFFU490VuDPoXaH/BysfxXMYuoMpLESsw+diWfbbcqhJZt9BJGK zYtqnb7hyAQAKKnloOrIfSpF9NOLWuqm28hfw6hFByfhtMJsvOkwSM6rld/mwKaML6kE VFkS94nLG9YW4kbLjM9UaKyvSsFXEs4doLKMgG/1kZEccpJqSWhB4hfme2Z6OMeMGCXy ngq0jN7jjQi0Rlq66lgHOnChcTCIVGnsWTpyxZc/rTG7hc9w6yfx4SCkkpeqKWLnIMaz oybw== 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:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=Wjr+VY02jmx8JL2dBALmz8QEjJFtTlhRDu2iSBVqCC0=; b=BsUkhyxHW0tucqdTmyl/WLAJt5eCGKPtPRwwcQ75sTG7aaoDif6MF2hjmU4333Kr9K AG4yJV0M5Aeff6QIvKABwBzjqpInWPXO2S4m1V4j3Cu3uCMZwDfuB02YpsIrWel1oCR4 9SnrgMyKHcCwAxFCYxPSIzWVREjQE6ST5TgwyKniOx210g7biEGK7M5O0M738azrvU11 ttn+klliKUxEx1a9q3fJbSKd+ZzlbN1WHdve+KfGTEt59+4FZtqLiM7aoB9hY1jQ3/CY Vm0yhEeHYXwTUoXZgEIeGPOScmlmh2AYflbjErK3r1Ie7XYTN0FbO0635E+yDEcuAtAa d2xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=j5hJUNgy; 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 go6-20020a1709070d8600b006df76385e32si8092687ejc.722.2022.05.28.06.27.18; Sat, 28 May 2022 06:27:19 -0700 (PDT) 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=j5hJUNgy; 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 09D4068B63E; Sat, 28 May 2022 16:25:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1595068B5D4 for ; Sat, 28 May 2022 16:25:35 +0300 (EEST) Received: by mail-pl1-f182.google.com with SMTP id d22so6444794plr.9 for ; Sat, 28 May 2022 06:25:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=jl7XH25H8r0mb+5TSAgSCoRFYVVG3H9Vh0iwMC9ANFA=; b=j5hJUNgyB+Th1ojUjVy8UFcPBqyKI0pSiTNq1Ud+UuEqw8tAq+iIRGqVLJJt38wh/f Mxb049sasQ9tL2/gFs0FpR+i6afAk5rYkzH/U/NqrcPuX91n8P2Or21fyvpTG/HBkXiD 0hkW/GOvvVL/KA+J+j+GP/LmR73L3XeXT2HuYB6IxvkWy6TxF9nDaRN8iywuX5DDbaP7 VMGRFA5fKbIGGg6iK/nC9gv+b13Ds0aDoYemd2tZ4qihh7MbNluypPtU++lTc0UAjpeI FGoJWO/AECPh03+DMlob2ZKrt6iGcOkq+Qen1WDgfNKmbBC266hXfPIo7zcPi+3jKWvp P7vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=jl7XH25H8r0mb+5TSAgSCoRFYVVG3H9Vh0iwMC9ANFA=; b=zNU+pToxyQTlI0N3+eDRzZ2XHhA75Kiy52+MVAtJ4nV1pWavO57lpwzd4UX8O7I8qz aDxnD//Wn8p+ehd/RVUfPujlvCySdXBGdkCP2Ndc9u6TEVYsayAH8Bcx5vupD+BWijHo CYVjc+ta5t9Cse7i1j6NVTXzhX6/RUAvzMJqKuLKMBgpk9meVSoqes2AjPZ1fhab0coM XJysYKawBYhWNxYjlImIfAlktOeDiAgw4Zda/YOTeLicLqaGg9ddUrBGWKKh/pHyVVSL xgBDY5Zlk/78Xz0giPjZ5567dz+ZDP+WAO+izK0Jwyzcw/ON4nV7MLzwHQOpHe2+ktmY Wpqw== X-Gm-Message-State: AOAM533XFFGYJK2zEZOTTwTkAiNC33wUXj/gB8JFQP3sE+tShDBala46 jLsleB5Y6i6TC6PEIsLOoopgTInEZAQ59g== X-Received: by 2002:a17:90b:1a8a:b0:1e0:3630:19f0 with SMTP id ng10-20020a17090b1a8a00b001e0363019f0mr13298690pjb.89.1653744333514; Sat, 28 May 2022 06:25:33 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id l10-20020a654c4a000000b003fa120ba003sm5312690pgr.81.2022.05.28.06.25.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 May 2022 06:25:33 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <09d8cf7880efc9a244fb338e812176dab620181b.1653744323.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Sat, 28 May 2022 13:25:07 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v4 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 Cc: Michael Niedermayer , softworkz , Andriy Gelman , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hP5tArrjpRG7 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 1a1363471d..7bb60c9b26 100644 --- a/libavcodec/assdec.c +++ b/libavcodec/assdec.c @@ -53,7 +53,7 @@ static int ass_decode_frame(AVCodecContext *avctx, AVSubtitle *sub, 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 6e510d12c7..fb54cf3f33 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -796,7 +796,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 b54073393e..058f4e22c5 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -407,7 +407,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 d29db7d49c..24da94faee 100644 --- a/libavcodec/dvdsubenc.c +++ b/libavcodec/dvdsubenc.c @@ -269,7 +269,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 e50c6766c5..05399863b6 100644 --- a/libavcodec/pgssubdec.c +++ b/libavcodec/pgssubdec.c @@ -535,7 +535,7 @@ static int display_end_segment(AVCodecContext *avctx, AVSubtitle *sub, 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 d62fa164a5..30c3595c97 100644 --- a/libavcodec/xsubdec.c +++ b/libavcodec/xsubdec.c @@ -107,7 +107,7 @@ static int decode_frame(AVCodecContext *avctx, AVSubtitle *sub, 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;