From patchwork Fri Jul 23 16:54:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29034 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp1552931ios; Fri, 23 Jul 2021 09:54:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzWscVvquCkiI/IFxqcLF6XMB4Rx/cEyj5nmePu0Gw9DpR4wRql7tiaBpyRWvPQaItU0bIF X-Received: by 2002:a17:906:7691:: with SMTP id o17mr5552357ejm.209.1627059286772; Fri, 23 Jul 2021 09:54:46 -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 g15si3157366edt.268.2021.07.23.09.54.45; Fri, 23 Jul 2021 09:54:46 -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=fpXIOe4O; 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 979E968AA90; Fri, 23 Jul 2021 19:54:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074019.outbound.protection.outlook.com [40.92.74.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6781A68AA90 for ; Fri, 23 Jul 2021 19:54:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WBLZyBVtd48X/xz0G092aCv9ReBxqda1DzlxfkMQhGrgNuEkijUR0z/f4pU7Yc/AL7GatKHklsavKI2omdrRaWG1peUHfT5O0OqvrA8ymitbwG+zuP4aYuTQFy/QpLjGhG0r6/G5foXUMJjL7ekO6NRcD8+9vkv2MLhk0n6jwW+qP3RoWozTOlz6hQ1Mayx+SmBuFeqgb2T0uegPaiJ8Kz0BYsQfsn5zojbRmhdvfi0VV1UEAh6qyAexjNi9qbzj7qvgkBhb/UiI0ShI34xoA/AVbeQbpyfAu+v4XZFEipRo9Y7l8jzO335WudnnTDwu3Nuv0LNA3XXo0K71BEUkGQ== 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=7HP++a7bKW+pugDNotxHWCaTtfrOZz4pHu1JPAy10Xw=; b=R/jy2IveABnEEg4UEOo3l9CZ47wW58MzjtSRZGhS/q3dUp3NoxVrJVFd35hjmNE+yERcMH1h5+C6fLd9bgMkFSZvdfik9g7xYtVYmjUXieV+xkVloMMf0/PpnHzHJZ3IU+5+uI3jBEwpSDQ2ODcB7/KwiZUFvb9jiLG0xylLu+TmuoEpgPfwFbkdVprBxOYQmMRC+91ykpPr5h4J0xA2b05i01j9xBnWpo6ZM5AR4VBEHD2EDrwEVDRNd4lxHkOAUFweLpX7XtUQIV9/MXRhmxyxWheG41+0xVUEJkp9J++XiMvm1ifx6VeUEvueOqc1hJCljUZ5Ezmue8FVsofHjA== 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=7HP++a7bKW+pugDNotxHWCaTtfrOZz4pHu1JPAy10Xw=; b=fpXIOe4OSJqaQrxLbisa89i1IaH0LEzLZTJ71KjBTEzPsIrywPDeLMOp7mKWf7kKkNCStO5+bGCgM723bjeDCdhpkv9t4/yRE9PTdLBxpDPZwZoEs6wkOyMfmu/7svUITvmOXQh6VPzeV1VxR9wDg5cVhoPPQI4kT7qquIJYRErk5k4DD/wbQaJGLJX33z+dJ8xle+2mdo1r5eZim2Ye8ila+8yO6i/uK4sMNOkROJP8dK+/z/YC7doFwmc6Vmr3mSu8c8I9z+MgfpzaKEeVE6kpq+bUepUDornK1CFdwqhMxGyZrobnIAuDEbT3Kun/hLn7Q1iXj+eeCvGv6LrM6Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3606.eurprd03.prod.outlook.com (2603:10a6:209:2e::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.29; Fri, 23 Jul 2021 16:54:32 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d%7]) with mapi id 15.20.4352.029; Fri, 23 Jul 2021 16:54:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Jul 2021 18:54:19 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [bB4FQ9+GZfEAH+XKX1xl+UEvi0aO1pvM] X-ClientProxiedBy: AM9P193CA0002.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:21e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210723165424.1650445-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by AM9P193CA0002.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:21e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.25 via Frontend Transport; Fri, 23 Jul 2021 16:54:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 21b32d8b-7115-4af3-8a8c-08d94dfa8aee X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIe78BGW2DBzJQrWpKnvOI5cAuOdtQbHfZYqMmlox2NxK1rn59qePal92NZnV0Vr1FkXqnx2WlPPTR/YTnVj13vowf5q0RvNuG+Sld541fFJQGi8t1gjaC43DvWesFdW+xB3zhcrxz7sQLhZ8OJBOT9eBUShG8c3GR75vU6T1QvBNLzmaRgnF0h2h616VCv/uDG21NmEIe0vxGL7CZZBAI3egriDhhnhLuHtVV49MbTKecarMGUK9IFKC6RTBSU5mSzh2UghrotVlX6bTauLNSpyjJhfR4KmDw35wBBP2HcKHrgajWN7LGs2RD2ym6OOrLNtgFOYZlIsUISZ8KnF4oQ0V2BuCsYTwTdrO5zm0SPk8PoMxNZClNUZ60Nga78PQyxeTNPwuE8HQ7CJbCbuzGfOgM2eER5lpKTP2LPjnPYz6adBn1y1mTmf4h7C18NhOmtEV4KAoe0Bo3FvYPoWYu+eegx9b7eUXy88nGH/yyw4E9DGwGOiH/cpPbL1QrV2Y4cKfapz7khnp+pi4XSTXVj8Zf8vAECKjoX4nJF7w0+N/bfmZiETzNw9Czw+xqNR61c7s5hVfSQFqP8NA1PrgTN9VZd8WkpUBp93kSjs1aUmKyHJTme48QRW4/qeNnEFKxB+jxRE6qcsSvqjLuQmtlv2IFAKwvbvUsbHgFWKENscnQE2CJ5k1z+c+54LNSpl6k9UlmU40kibQ== X-MS-TrafficTypeDiagnostic: AM6PR03MB3606: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kz8TFPspDeERHxWEfQoi+Y8Ar1xM6Q52EZA8sOzUD5wXiyxhmBDnBiO8Y3Ulygj+PWDrcrOETOHSiVH7Vyc0GCDnP9FwfY8pSTT4o9Nzwo+pavQO/AztBD/QObyxSWYqkModcxFoHvBtQN7iST8GyhcIB7cs3E383CHfEaheCkzvtGICo+UDTWfWvGp/G3iJ62a/WsryMKa/r3rdhy/oaVy4kGRwZUryPNxUclAMmiA2PRbMt5x1i6I1l2ei3jUe2vvdtgFm4sfYZzdxXUM9ns/WngazXGC3Eg4kZdQcP4WOCFPdtyxg+H8XC+hsBSUaXkqZl9LM4AMVrO91D1b3Ftsfi3cJiSfaqFn8V2ZCBBx/l/B9ALc2FChwssYRH1yQPwyWUfi9zk50Sbp4t11JKl/I/siu8JZhyQcy1Att3KjqjLdHITbkzzX2PEix1vPh X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AmRhBnjElk7cTb7EoaYwKr53BjGINZSznxyXUSdvnIlIU/SUhqWeBlKns9IUlyqMZC9naoOfmSFImJ1TZKdBLj6ktBUbfscwe2SWWG7erVCrh59Ff0NSeso3Eyuw6lgPyVcdCNhoifcrJ9TGchcolA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21b32d8b-7115-4af3-8a8c-08d94dfa8aee X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2021 16:54:32.2486 (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: AM6PR03MB3606 Subject: [FFmpeg-devel] [PATCH 1/6] avformat/aviobuf: Make ff_read_line_to_bprint() static 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: iGMg9CeDb9Ul It is only used in ff_read_line_to_bprint_overwrite(). Signed-off-by: Andreas Rheinhardt --- libavformat/aviobuf.c | 4 ++-- libavformat/internal.h | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index ddfa4ecbf1..66fddf1433 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -794,7 +794,7 @@ int ff_get_chomp_line(AVIOContext *s, char *buf, int maxlen) return len; } -int64_t ff_read_line_to_bprint(AVIOContext *s, AVBPrint *bp) +static int64_t read_line_to_bprint(AVIOContext *s, AVBPrint *bp) { int len, end; int64_t read = 0; @@ -830,7 +830,7 @@ int64_t ff_read_line_to_bprint_overwrite(AVIOContext *s, AVBPrint *bp) int64_t ret; av_bprint_clear(bp); - ret = ff_read_line_to_bprint(s, bp); + ret = read_line_to_bprint(s, bp); if (ret < 0) return ret; diff --git a/libavformat/internal.h b/libavformat/internal.h index bff948e9a3..d71852afb9 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -539,19 +539,6 @@ int ff_get_line(AVIOContext *s, char *buf, int maxlen); */ int ff_get_chomp_line(AVIOContext *s, char *buf, int maxlen); -/** - * Read a whole line of text from AVIOContext to an AVBPrint buffer. Stop - * reading after reaching a \\r, a \\n, a \\r\\n, a \\0 or EOF. The line - * ending characters are NOT included in the buffer, but they are skipped on - * the input. - * - * @param s the read-only AVIOContext - * @param bp the AVBPrint buffer - * @return the length of the read line, not including the line endings, - * negative on error. - */ -int64_t ff_read_line_to_bprint(AVIOContext *s, AVBPrint *bp); - /** * Read a whole line of text from AVIOContext to an AVBPrint buffer overwriting * its contents. Stop reading after reaching a \\r, a \\n, a \\r\\n, a \\0 or