From patchwork Fri Jan 14 01:13:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 33573 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp985987iog; Thu, 13 Jan 2022 17:15:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJw86/INjbOHEieVU3Tik+H0h+zL2QK9v+Fyyebptavv5/OmLNiRdHv7NS+URPZVCYnPsE2C X-Received: by 2002:a05:6402:f1b:: with SMTP id i27mr6509333eda.225.1642122941997; Thu, 13 Jan 2022 17:15:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642122941; cv=none; d=google.com; s=arc-20160816; b=xnPr8stISVFusG5znMpjSwfvaM22jkNmZhAl7UYZYvl3G+VT8QEXWkSCBxahJObfTz BGo8TbQ8MmUrxZeb1ytphjswJ4qGpYjzZXNYL6oSMJ2CEVgGSyfEzI8XolZ0zxDQpDY8 9xKrwBAtF3bEJwXojoNqBmFbSghpReUEXusLzEm9ao2EQFPw36wEg9Mjdwxvv/Cp9yfn Bz+kjt3L3e4kocKiTF7MgC5/9rv5c40ndYzWE+9kaaDBrMpFbwzE82DhS4mjdW+sxFgu YKicu+uxNc4hPyrXGV3qQtsFsLAhV6IcjW8R4QZgOxLjFAny1Ql3p/FtmMkb1tON7dkf vGOQ== 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=1RAxF2fj15VFJ9FPM3zCBf7wMu+GEwUZz0PHlrEq2cM=; b=mgO7+/oBr67TLDcKnQyR4Y+PTVwGcNO5PQ4eC1MEHVHJ7r+UE/l94lYyfDkRglI0Pw f8B0tEEeQtYXTCYWel/XJaoFIvrAWqJ9r5o0rJOnJGyE6GE46jlST55iUOgukD72YrMJ KCVZOQlo133v3FkCvFMF/IOavfxKTx+FWfjpC50dx+srzp02Q4glcs773u3Pj4kdcqAL 8+p02G2Q33Hmo9NJH8OmH2QuA/iIgjR4ds7qAkILnCkc5d9SWiX7h0zfeJkNhmkVIqCL +k77qhDJDvySRAs82UZW8dAn583iea7Ir6NtlNuV/+wp5Ol6SRLiY+e0UJJoDVLvbZ+J gInA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=N01cPKU4; 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 w2si2383115ejn.640.2022.01.13.17.15.41; Thu, 13 Jan 2022 17:15:41 -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=N01cPKU4; 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 D038F68B5C0; Fri, 14 Jan 2022 03:13:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 973A568B5A5 for ; Fri, 14 Jan 2022 03:13:44 +0200 (EET) Received: by mail-pg1-f181.google.com with SMTP id s1so1434659pga.5 for ; Thu, 13 Jan 2022 17:13:44 -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=+Qq3NC5GW+Y2NNctI0yVrxm3g6AID74nGNCi+ZUPOkA=; b=N01cPKU45PD8q0KcWLsicVeKdsPrHf1kZZebqpDwyNFNtPzzM2cST7NmAKcRxlys0y cwcnGavudsqgiu9dR+ymVbll+saI3U/qvtzlTqO8+C0U2LGK8mXzMMvvabnX/GC71VIJ ki1WcXmEUZy4OlCJQYH3nsYCRw2Ho7CCuXrv94nZWlm9I+LVB5LF2gVdR++GZ6xrPIRi DmJl9ZV9KKxO6dGJyEecE9Banc7SL7dW5gVPlJ9lltnYtOYgaKlhW24HxfD5aXPWU8wA qRPF02Nh0z8QTHM0aIEO+X9NjoAfbDLn+jtiJ8jWv5g5mXwji6hROGsB4YDktYmUD+7h b5fw== 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=+Qq3NC5GW+Y2NNctI0yVrxm3g6AID74nGNCi+ZUPOkA=; b=JyunWREgCNSJbcs14/JxHcYhS453XIUTHMGSGbjZkZwQ76GpuHddb99fK8H6TfLiaO 5wkm/+NZn/b4RbwzPcbti/k971DkI2/aSuVejcy7eJr0XggmfnOafD57nLiwrutfz2Gx m+S9lP/DOw0G+niZS/BToTAUlWHffzX7Nq/ksPI1OTnSGt7TvACD6onP+U/dtHO4R4pm bxi1bmQIVTYOmQzTBlMohJ2gPihmjgP9YtOv8NQirY56hu+ndLZUSHWLxIWbmjKT0asy ZvVsUkMCWjTVfjgmZp98IM1rb0gEM0ciAOZNHHLNSxZCuaYItIBTwXdG6qZhhqExoerm 7jqA== X-Gm-Message-State: AOAM533L12WrlAHP97l9N3Qkf58TY3CQ2TCGX4lMjmRv2IoSe1Vl2XUl bF0wr08HdnURCXhwW/uwOsWAXX2gCgGBUw== X-Received: by 2002:a63:a00a:: with SMTP id r10mr6010779pge.553.1642122822989; Thu, 13 Jan 2022 17:13:42 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id 198sm3703109pfy.202.2022.01.13.17.13.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jan 2022 17:13:42 -0800 (PST) Message-Id: <34be31a7ebd17c55ee9314f42482b89de1759ea4.1642122814.git.ffmpegagent@gmail.com> In-Reply-To: References: From: ffmpegagent Date: Fri, 14 Jan 2022 01:13:16 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 07/24] 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: softworkz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: d7z41H5UAmAu 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 84f2a544f0..ff21e75ef3 100644 --- a/libavcodec/dvdsubenc.c +++ b/libavcodec/dvdsubenc.c @@ -274,7 +274,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 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;