From patchwork Sat Aug 7 01:47:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29325 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1009584ioh; Fri, 6 Aug 2021 18:48:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy4JH5FAzB+fH3svDaftZqW4nXzUguYPzsfFA/0prtEi2lc2+MQVXOX2ErLbttbk1sMWqJ+ X-Received: by 2002:a05:6402:5214:: with SMTP id s20mr16558438edd.374.1628300891312; Fri, 06 Aug 2021 18:48:11 -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 b12si3984613ede.46.2021.08.06.18.48.10; Fri, 06 Aug 2021 18:48:11 -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=fdGsI5le; 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 14341680C03; Sat, 7 Aug 2021 04:48:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073048.outbound.protection.outlook.com [40.92.73.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89762680C03 for ; Sat, 7 Aug 2021 04:48:01 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FvvoX2H0CZ3axQGqw3y29ymSjq3AfEvVr8pnquHjqk0whU4FsaDWhnGKceo7mwYa6Yk81QiHI1NNbd+aeMoLL6oVJ209yoxGuPxA6VNYxPXW/XG8Ky042gdidnUuijYnAlqnOs3nPOzFjL08f1efcTda2U3ftAqC52PH13nl2CLeFzLOnLLKCg8a3u3rLMQRYvcicKFPWRoLBDqkl0jLskx6bWMSseSwtUrNngeBBOEuNEMSH6eYLEBnSlLmAifQ1CCkDokHow2WajYUYedNRMmDhiNPY5od7DFWH9cQrpPRB42iDefcomDs3qy9uQUWM+lH7To1jC7StUC+SFGj9g== 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=0Vw2Ljyz94nbnZYlSf82ul2yo3VJvzf6TdO39z15pgg=; b=YIHU17RI8BI/HrVCykNSG3KSmCVsTtkLRISNXGKuoD1+RE+jdF629Ri0Hwmli1An8SrEGluaJhoTah1cTt52GuZdKkBBA55CimiQBKuA5tCMhul/kyRuAA00HidTlgRX00IJlwbljdbE+LHhgJ1SWKCdY/vNU4pwnASefyiAC5pQrn+ofwnE9o91Ud4pfos9xg6wRFVe5K9lG+3tz6u4AmS/xgIP5wbrubX3WFtaZITBIDTShZwPSBG//JgjJj/4scZEQcz9bXLdmDhoh9b2Itls3APbbu9pRipvPRKMe2EWqZwpjDeyGJUQJ7hN/KOW6SAMwJyA3mLzKsaSCFqRyg== 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=0Vw2Ljyz94nbnZYlSf82ul2yo3VJvzf6TdO39z15pgg=; b=fdGsI5le71u1vaFnP42BUUWi4OK/ICP5cGbaruYZVtZzbcKhfai3hE96NPNGHZBdAnR/EVm9l6EdwKim/n4o+CdUuAA/DSP62kpxv7739E7Rv00jQtQi8z36gC3cTds8t4oXAvQxvoB6tYDVM2StrPQFPgacPkOuP3lu0fg77mG5ZVUGvLn7PJp8ST9vL0NsBnkBeIptG1AOHYM6zgOWUNRf5NRG++PpSnHvEt8LGdg9qZa0cDOqtOgTaTyTCNhra1PQwUNmPMMHncV9wujTJ1i6GwjHjzsHol3pHHH3IS49S5TNFw5NnAvhPA30kjQhM+F8LU0bMytlgZXZTGhYPw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4374.eurprd03.prod.outlook.com (2603:10a6:20b:f::32) 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 01:47:47 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d%8]) with mapi id 15.20.4373.029; Sat, 7 Aug 2021 01:47:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Aug 2021 03:47:35 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [93l+zmHWlbmUfLfrHQNukshrtY9XZ4ar] X-ClientProxiedBy: AM0PR02CA0092.eurprd02.prod.outlook.com (2603:10a6:208:154::33) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210807014737.3310698-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.95.102) by AM0PR02CA0092.eurprd02.prod.outlook.com (2603:10a6:208:154::33) 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 01:47:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 71c5f65b-2161-4bc3-ebe4-08d959455b8e X-MS-Exchange-SLBlob-MailProps: dEG5jEBie8l+ApwGf8kBLftMpg+pjJZOsRs1bpWDUcacIQpwIRydNvwWJxuh4oPEAEOhFXRrnYmk6ZxrFWMEdscLpD76RKzDHFxu9ta+5P0H+n7Epig13s2Ryf2e+VoJVBIXKbAfBEDHYgzJauqT/Vt5iuQcrbW1kVkHGgxPAaESAQMLZaS+GcQ0ekrNI1bc1mAVsEjmy3E163V5e5yU+A4+Ez5ltwHp0MbYT3hM+jXix/4bmV8VPqzgLWo/XPEe9SGProvnQbcDEzPNc5fTLTpgF8l30hRnJCd33InwdezOX8hCjcxBKHCvUw6OsUJUI1bqihPxnFHxcOX5/0fklPkKr0+q+2HHRvWNTpNuG0KqaKzcOTbnOiPs4DKRnv+JMjKz/sVM+MQyD22jwJKMRZtLKxJATI+34o4652M+nIq8z37u96XkKYszfzZkxhTcmlHdj3Pg4Vp8n/IfW4NeHJfh88LQWzv3gkxQw22w+/o7cZ2vWT22qcbk+Z5CYVD+iP2eMlksFQ4xGH4zQo3dr0KmVPtqx80aeNxSt/N0Q3IHygyHNVRSAe/ju2lsjmkRNoJh5HdyPgBuKKIh24KUqxmGVXuH1ezj33KAEk6ObmP4Z8PwpSJ8GKl24EGOeH2oG0TKjdJKGjp5ZerNSqlxovDCuNZm49R7EeAvpzMJTzeOpIXg105FeQ== X-MS-TrafficTypeDiagnostic: AM6PR03MB4374: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 26Zzs9HKzWe2Rnfe9ZnWsiSGpBtR1Cd/aKc3Qsn/sfQRRHLdgYaLQeGISw9op6mvy4g+iLYRXtm7IWGgsnEgcmLC3tvIr8aUDSBearW2ZkZOtVcfX8t9OOpp3Xo/DrP/UEayJdUtfFCs16v8O35svbvPER+Vcbe0JrUi3100pD2YxZZ0AA8gB1bOTj2nu4LH8kICPJq3rrB5U2BhL4toZ/YV8k/qLP4sz+aXUsJPlAyTpkezUQlezisbwTa0HHc5AiJyqB/nh26D7K9dNBcMDLdEc0p5Yz39SR9oXDIaIQi6c2LTb7PFtTYZ6qQzLOvuAX1DSBx/mdsCsjikxo6yCOirtj9KKS7FF2/3QAVz8X9bT/1F/kd6zVXlE8r/qVJX3dH1jbaInNwOLpsZiTdDGvzKt1JSie5NIUlRZwz0XmijVM7BL1dAO+yaIXNlZ+E3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yg3GIPkPoauMMqcoqGvYnJuavkrs6cY9X9fMtrCEkXpwaiAnAWjKu6EHo8CeaD4sZmQW22Q8aAlALeMIrIFnE5snkfeb/Ci5wCXjtr7HUCp8x1e+XanvLGDisJL4dLMfUHqBLVDhb4M8oU1+wKvIEw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 71c5f65b-2161-4bc3-ebe4-08d959455b8e X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2021 01:47:47.5096 (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: AM6PR03MB4374 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/ass_split: Remove unused ff_ass_split_dialogue() 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: ETDp6tPsqHXu Unused since 1f63665ca567fbc49fa80166d468a822c2999efa. Signed-off-by: Andreas Rheinhardt --- Shall I rename ff_ass_split_dialogue2 to ff_ass_split_dialogue? libavcodec/ass_split.c | 19 ------------------- libavcodec/ass_split.h | 16 ---------------- 2 files changed, 35 deletions(-) diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c index ea3008ce91..5e3883fea4 100644 --- a/libavcodec/ass_split.c +++ b/libavcodec/ass_split.c @@ -418,25 +418,6 @@ static void free_section(ASSSplitContext *ctx, const ASSSection *section) av_freep((uint8_t *)&ctx->ass + section->offset); } -ASSDialog *ff_ass_split_dialog(ASSSplitContext *ctx, const char *buf, - int cache, int *number) -{ - ASSDialog *dialog = NULL; - int i, count; - if (!cache) - for (i=0; iass.dialogs_count; - if (ass_split(ctx, buf) == 0) - dialog = ctx->ass.dialogs + count; - if (number) - *number = ctx->ass.dialogs_count - count; - return dialog; -} - void ff_ass_free_dialog(ASSDialog **dialogp) { ASSDialog *dialog = *dialogp; diff --git a/libavcodec/ass_split.h b/libavcodec/ass_split.h index 30ce77250c..2ce756203e 100644 --- a/libavcodec/ass_split.h +++ b/libavcodec/ass_split.h @@ -109,22 +109,6 @@ typedef struct ASSSplitContext ASSSplitContext; */ ASSSplitContext *ff_ass_split(const char *buf); -/** - * Split one or several ASS "Dialogue" lines from a string buffer and store - * them in an already initialized context. - * - * @param ctx Context previously initialized by ff_ass_split(). - * @param buf String containing the ASS "Dialogue" lines. - * @param cache Set to 1 to keep all the previously split ASSDialog in - * the context, or set to 0 to free all the previously split - * ASSDialog. - * @param number If not NULL, the pointed integer will be set to the number - * of split ASSDialog. - * @return Pointer to the first split ASSDialog. - */ -ASSDialog *ff_ass_split_dialog(ASSSplitContext *ctx, const char *buf, - int cache, int *number); - /** * Free a dialogue obtained from ff_ass_split_dialog2(). */