From patchwork Sat Aug 7 21:54:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29336 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1627185ioh; Sat, 7 Aug 2021 14:54:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJWRnYhEFF0+Ot93S15CoAUXBC35A+zxFnysdhHICzx19pW8hCwLud445C9H46oOtFfjml X-Received: by 2002:a17:906:1615:: with SMTP id m21mr16174873ejd.279.1628373290816; Sat, 07 Aug 2021 14:54:50 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u61si13916255edc.99.2021.08.07.14.54.50; Sat, 07 Aug 2021 14:54:50 -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=@outlook.com header.s=selector1 header.b=jjDT5r88; 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C546E680665; Sun, 8 Aug 2021 00:54:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068082.outbound.protection.outlook.com [40.92.68.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 25FC668806D for ; Sun, 8 Aug 2021 00:54:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RMa8hhOsicA7/o7ZkcF71BfoeZ/cQMaXufYd74bHdG9vCWXfy1KZ0yB3QZ0cxETaA1iQG3zYwwnqM+4Tf7g2XVqHBVIFWY+dxGdeSXSIFAio9KX05I9U6Y27FY2KwnEr37Zbos0FRwOld90SnuAlAjKORbrhWQ3xuOl6j4GXABwNaWsCQx4d96YevTe3yjW/P0on+OS+ubhGI1cjm36dI50nIrR9tl1Xtmgns1nrecfPCifkI7mcuaeGph04YxkVVVg/iy2ect2Fis28wZKxH3Eu7vYr+JBPCKKSmB6Sn3Pn1PjLtYdyU/3WVtErPhIagHjyuUl0Ux/1SxRwd4qqHw== 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-SenderADCheck; bh=EGnPgywTKUYKzBt5w0jxNnHuzJFB6SvJcn/juqvgnAI=; b=KzaRATjnSS0NL0GI/M644qQLLhwriG6doOQ7rffACWXgS3Z2FtmtbzaYCxdlJLg9VRFS6TDnQSKE6raHRph7htfwrD3jMs1hg9M3dxqUL1IkSxkXZ3/TMwwNFzYL5aDeho3pTMOPWlo7xFG/LVHwxmLWpDeJFQu557roXMRU6D3V/gZDPl3iwqP3s7go8Omje0E2rNGsKJSA7uqpvGypA8QMsIMXoW3Yuuo2bk5cRZUerj8AQlGpaPrmpKecpcrAn7FR98ab5qQIddaX0LOfuCgMZrx+u58g6Rb4vwgq61LOqD7bl97JOC1kaYOCcGkwjulTgKsn1H09EiHwO2mf+w== 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=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EGnPgywTKUYKzBt5w0jxNnHuzJFB6SvJcn/juqvgnAI=; b=jjDT5r88jAsBxUp6HIuSbTQyM2PLMz+VHe9YlYxC58w8mvywXOEjE1SgyPq3Zrt6L2wuxP8k5fTMS++AZoj0gG/73sJAERq8sprcxbfV92KAfSS8iv2n1V38Sxv5gwvcEtbovp42V5g4m9+qwQ1+q+C7VnAHJxQji/F50sIfwppH/WeEgn36Cak23IcBxj2GfB4SAuVJfYNlVl6UY5VHF2n6n6h1zATuJyrP0AyPl4rpE5BRZ8aTOq8jCHdd1QS9cVJ3f4YR1zfTjB49h7iKj3zXHNxOFpNDa3Uq+Hnp+ZqfxCtA18Y1dPFDtvFziRfYCGSEn8tG9Pq5ZDAQVvihsw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4535.eurprd03.prod.outlook.com (2603:10a6:20b:8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.17; Sat, 7 Aug 2021 21:54:37 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d%3]) with mapi id 15.20.4394.021; Sat, 7 Aug 2021 21:54:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Aug 2021 23:54:26 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [2W1Xi/YKvu3Ynv+XEvIiwMLDnlSXhWUw] X-ClientProxiedBy: AM0PR02CA0129.eurprd02.prod.outlook.com (2603:10a6:20b:28c::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210807215426.3382564-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.95.102) by AM0PR02CA0129.eurprd02.prod.outlook.com (2603:10a6:20b:28c::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.17 via Frontend Transport; Sat, 7 Aug 2021 21:54:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a877e163-5948-4e5d-4e3d-08d959edf310 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQtfblVQkesoBt4SLVN+G1Bp3MXTttBFlZkeiQCRkiCRwMDK0dkj8BleqCxjIZPrqC2UOFAcZnqXdmaG2EYtptQ09Yz66aQ/tTorGsYwR4EZY2awCURW+GHUkE4jXCfhRhB7T3AP9HxrO/EfgnR2gBBonWUJI5yrhNCbvsOkOYQvhBUD7wBGQ2ijV4+yWTvyCzxQ0pZ++Glzk30MLF6ufNNbtnT88d0HMM61PxAzQPHexlMioX1CY3WyV672FYGHVqhL+uom8T64mc79k2RQJfvsxnNyIBVGkGnsWQCe1eKJbm/R7HKQKJhSXw6NPTKB1g1khgm5ZdUXqt/mk840gEyt2f7iotwDDmXzbyL9LDFTE1h4LDYiTBSFkV4QfrUq1J545+y1LL+KJLRehV/hbghQusMeIw8yl6gSN/lMh446JSXvMJxUBRDqkRRTQrawTuESJ5jCeDZVEU3kobRaZiH27mWhnPkYSrp3wFn6T2kYbjdTItvdqxtbTlETEyoqWNtS27zSp44Wmc3dBCjiJ9SrBEuvnIqRBRy6muGIpuaSUTjwnocPlwUTK/OoTsN7nqVtol7fAkdshjxhPqR+oqeLNdyBbEVcpvjKW4fMBdfY95haKzgINPhV6iMe4Ev4PpnrRfhQNiAUNz80gm8h0mzb0P8/ua+xUR0cFIhjNQ15Q9J5sHg0P39B+txPghPi4XHwJmIRfxDfe1U7pU6p7aHvPXNkjnTnAbEkhTYdfKwefJX2O+D7+eJ1ExCR/CpTfE= X-MS-TrafficTypeDiagnostic: AM6PR03MB4535: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ocbn6YuIDmqU3kUGZivl5ZPidPklYwd8Ox8ANFKuTyq/h3GU262i9B3OnCHnRR3nDLydMtcaI+geBImjMXW5DrZRhODHndGy8487Dj+sXYJuBMVRHhM1I61ZyKhH/cO0ci18KJS+XkjUfM7uUS46ValduUpzt3cnjghvpaxmviTrjqwkEGSmMW+MuLpTKa3dMLcIY3fYGHzXds9RJ5Tmjc3K30D8bxTYnfQDoW/CDvyj5JvNzZh6Kw+vNqVrjrIegmJByzQTCwmnSfcgjsyw5PjIuFIHqf8A7hzPR8Zaaz6VmYDN9k5iJ7D62+F3FDauEs0OBU1l/ORdv32CD8yZ8mTM4JmR9FvyjW2wyx6enRigmSrADQ9m1RJV8dT/jtfWCjMwbDS/sXmwJD8Klp7NW82/khikbj9lkbNHmzB2qOpJ3Jx6Ynu48zNUPChdVX2OvZFoSSzHIW8OrQnRuySzzolqZLdS68MOHHZzavYN2j0= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ULa9to/k7yDkVoLC1h35hEGSHkl/H9d4ZSTdm0uotTJa1aoeL1pHxQfj/WMtV6b/fuynOvboMir5+ArRGVIQjvXQJWxcCvPjXndgurq8xW/zbyHBpRIK2kcyB2foUOQm4bG7OFosdtvokuIwAoPs6g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a877e163-5948-4e5d-4e3d-08d959edf310 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2021 21:54:37.1819 (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: AM6PR03MB4535 Subject: [FFmpeg-devel] [PATCH] avcodec/ass_split: Rename ff_ass_split_dialog2->ff_ass_split_dialog 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: IL54H2PaKDJD Signed-off-by: Andreas Rheinhardt --- This is in reply to James' opinion here: https://ffmpeg.org/pipermail/ffmpeg-devel/2021-August/283267.html libavcodec/ass_split.c | 2 +- libavcodec/ass_split.h | 4 ++-- libavcodec/movtextenc.c | 2 +- libavcodec/srtenc.c | 2 +- libavcodec/ttmlenc.c | 2 +- libavcodec/webvttenc.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c index eb7ff2845a..05c5453e53 100644 --- a/libavcodec/ass_split.c +++ b/libavcodec/ass_split.c @@ -424,7 +424,7 @@ void ff_ass_free_dialog(ASSDialog **dialogp) av_freep(dialogp); } -ASSDialog *ff_ass_split_dialog2(ASSSplitContext *ctx, const char *buf) +ASSDialog *ff_ass_split_dialog(ASSSplitContext *ctx, const char *buf) { int i; static const ASSFields fields[] = { diff --git a/libavcodec/ass_split.h b/libavcodec/ass_split.h index 2ce756203e..a45fb9b8a1 100644 --- a/libavcodec/ass_split.h +++ b/libavcodec/ass_split.h @@ -110,7 +110,7 @@ typedef struct ASSSplitContext ASSSplitContext; ASSSplitContext *ff_ass_split(const char *buf); /** - * Free a dialogue obtained from ff_ass_split_dialog2(). + * Free a dialogue obtained from ff_ass_split_dialog(). */ void ff_ass_free_dialog(ASSDialog **dialogp); @@ -121,7 +121,7 @@ void ff_ass_free_dialog(ASSDialog **dialogp); * @param buf String containing the ASS "Dialogue" line. * @return Pointer to the split ASSDialog. Must be freed with ff_ass_free_dialog() */ -ASSDialog *ff_ass_split_dialog2(ASSSplitContext *ctx, const char *buf); +ASSDialog *ff_ass_split_dialog(ASSSplitContext *ctx, const char *buf); /** * Free all the memory allocated for an ASSSplitContext. diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index a6a1808592..2ae5a9bf0b 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -654,7 +654,7 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf, return AVERROR(EINVAL); } - dialog = ff_ass_split_dialog2(s->ass_ctx, ass); + dialog = ff_ass_split_dialog(s->ass_ctx, ass); if (!dialog) return AVERROR(ENOMEM); mov_text_dialog(s, dialog); diff --git a/libavcodec/srtenc.c b/libavcodec/srtenc.c index edc91c4013..2e3ac55770 100644 --- a/libavcodec/srtenc.c +++ b/libavcodec/srtenc.c @@ -245,7 +245,7 @@ static int encode_frame(AVCodecContext *avctx, return AVERROR(EINVAL); } - dialog = ff_ass_split_dialog2(s->ass_ctx, ass); + dialog = ff_ass_split_dialog(s->ass_ctx, ass); if (!dialog) return AVERROR(ENOMEM); s->alignment_applied = 0; diff --git a/libavcodec/ttmlenc.c b/libavcodec/ttmlenc.c index 5cab33cc60..ad2eddfdd5 100644 --- a/libavcodec/ttmlenc.c +++ b/libavcodec/ttmlenc.c @@ -95,7 +95,7 @@ static int ttml_encode_frame(AVCodecContext *avctx, uint8_t *buf, return AVERROR(EINVAL); } - dialog = ff_ass_split_dialog2(s->ass_ctx, ass); + dialog = ff_ass_split_dialog(s->ass_ctx, ass); if (!dialog) return AVERROR(ENOMEM); diff --git a/libavcodec/webvttenc.c b/libavcodec/webvttenc.c index 3181e25120..89b49e42bf 100644 --- a/libavcodec/webvttenc.c +++ b/libavcodec/webvttenc.c @@ -172,7 +172,7 @@ static int webvtt_encode_frame(AVCodecContext *avctx, return AVERROR(EINVAL); } - dialog = ff_ass_split_dialog2(s->ass_ctx, ass); + dialog = ff_ass_split_dialog(s->ass_ctx, ass); if (!dialog) return AVERROR(ENOMEM); webvtt_style_apply(s, dialog->style);