From patchwork Sat Jun 25 09:57:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 36434 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp825717pzh; Sat, 25 Jun 2022 02:59:39 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s+GwdvAjJsnU6jSB/b5YV95sq+BWl9Uhy9T5ellNT3Zq+2uH+/qmlJHTrrbyDkCcN+FfZo X-Received: by 2002:a17:906:1ca:b0:715:73f3:b50f with SMTP id 10-20020a17090601ca00b0071573f3b50fmr3078104ejj.374.1656151179082; Sat, 25 Jun 2022 02:59:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656151179; cv=none; d=google.com; s=arc-20160816; b=EDAR+/gCk+D5gxlYlWBGp1FonrRAcEAm2cAB5iNNJ6wJ9WvQp3E6GdNUllfnlseEjK u0bqF8zUsnZnCV2F9h5A0Mcz522C2QBJi4j0ZoAriML4ytoHtCM2Emsh0nt3Ux6YY5xy vzuGakjPTyP49Rl+JxrNIgGeiOb23xNLG1U9BHKCdIPiVxo2rp5sJjUAHoVHBs/+mvZp O7SrVe1IO5SAbUMMiOr6AtWo83pSQ0KZxN2hjZUyKUnd36CZ7QK9esvjmAwAypEOXWLQ Myn8eE++yzUu+XbmCDvx2gJj3CcTu+AiFgpm8Y2jMK6mYNTgZ8wXCTPQR7DnuXVsDW1Z 7N3Q== 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=AdfbzB3AU13UignUU2Lkttd2WL1qzq5cv4x+aQwF+A0=; b=lDzbyCIZxLrs27bTCo0SBPEFua3VuX0no+KxoGfzK4Mlzf3TF01hIZahhxjK0A9FXt 4vlQOYuWqmfSm/FD6GwnYynt7CxXC71m2khdl46jMsKx8uAh8baxCZVShOnE1TLbUKbG H9O7d0Bh27skqbQ6RGoLZmB08r9A0xXKELxuRAHcKJepFS+1gVMGBD6fXMho6eqDPyw6 9mniQq2z5Ub4ouOi2MUDAl00c9vZwch+jcCd6SEQD8WUJ/9K/LKeNmqi8UVCRMiGgfr+ PvCAL3ILhdH6Sjwaz8E0zQ32pGG8DFEfhJRGN1SF5YH95V/2olZGl5fDlr3azKjpiR4p CbYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=PLeXdYhV; 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 o23-20020a170906775700b007084cb35e5esi4587403ejn.442.2022.06.25.02.59.38; Sat, 25 Jun 2022 02:59:39 -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=PLeXdYhV; 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 E054A68B7FA; Sat, 25 Jun 2022 12:58:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AEEFB68B81A for ; Sat, 25 Jun 2022 12:58:10 +0300 (EEST) Received: by mail-pj1-f47.google.com with SMTP id a11-20020a17090acb8b00b001eca0041455so6910113pju.1 for ; Sat, 25 Jun 2022 02:58:10 -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=+apdqQWCXjvbsiBGHTxHJr6NcaFsm4pI7Cn96n7SgWw=; b=PLeXdYhVwVMPQrWptWViL65y/r6idZKCNLkOk/xzMPtg7NyidXKPrVXYzmfbjiAADR sO8AxioKbMHz1K5FNrDRWmENhj3UJ5VuP4vB6Wl0iNnLkxTpyrZOK9e02PFxNPAyxblD CJvUB7RknYMeds4fHJHRy63KN9JKITWJVU8gyQPWhXKk5U/U6mR1iXzKjCMODEX6Ky0O l16BH3Bkf26uVjJbxZ7iP/9nSaVijvIZzJ6oH06Ide5dCrGA/Ynmin/AC53NSVssb1n9 Di9bY11Tz6IlH+LZJ37t1qxR01Kwar/9IaYFJXOHICJTD3M+8jGKxMYHo67DedmhDBRX AltQ== 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=+apdqQWCXjvbsiBGHTxHJr6NcaFsm4pI7Cn96n7SgWw=; b=cp8yQIzqw21d8Vnd98OH16qNHZgss+r0k5e+gb+nRdTvNIEm758m7yFC4siT5ulI+/ 0obirktw3GAh9J4cm+S0ASN70ByYXgjXOp53kj/YnRNvqZIBrLtUS/0T/jGoTBA229Cr oYD4d4xX0xlN6APcivsfmnWuVep+hjNAb9tFPk2iIBB58qhp61edhLDL76PVc3eTNU+y NPq/5yoAvq2PEm1X1tJRvbEwdIwjfq2cFTbQj7hHe0+16E/ZKEtKUSDbfL/pnTo0tfjm URnu6msoPEj8j5FP45e9MbnMVT1xIF99iuFZPlsOsqiTqBOCtB4lO87gzYOkUOxXX9Nq JesA== X-Gm-Message-State: AJIora+vJVeF0lg+yABKHHlE3oj7pHg+Yr4HNEyPcE1XXzKr3mSx0zFb 77l/TLVmMSl+NAMm1CZv7RCGQXheYHO1og== X-Received: by 2002:a17:903:1252:b0:168:d68e:8bd9 with SMTP id u18-20020a170903125200b00168d68e8bd9mr3552828plh.141.1656151089104; Sat, 25 Jun 2022 02:58:09 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id t14-20020a63460e000000b0040d4659b79esm3123055pga.60.2022.06.25.02.58.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 Jun 2022 02:58:08 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <98f12ad7e90811c5eec7fd535afd916cca7af3b3.1656151077.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Sat, 25 Jun 2022 09:57:39 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v5 07/25] 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: xaMdi+2k0ezf 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 4d4007ffd9..8d44529b4a 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 97f366cc74..cb6dbbbbbc 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -404,7 +404,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;