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 From patchwork Fri Jul 23 17:04:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29038 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp1560207ios; Fri, 23 Jul 2021 10:04:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwvt3cH9WFt4x8Z8EhyoE2a/RVV+YpTiAlWJIY31jLebqwlHwiDAHLVce6JY2eu43K01v8N X-Received: by 2002:a17:906:b10e:: with SMTP id u14mr5722987ejy.522.1627059889649; Fri, 23 Jul 2021 10:04:49 -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 w21si33911781edx.566.2021.07.23.10.04.48; Fri, 23 Jul 2021 10:04:49 -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="iSiW/hiF"; 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 80C5D68AE12; Fri, 23 Jul 2021 20:04:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070040.outbound.protection.outlook.com [40.92.70.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0FDBD689EAA for ; Fri, 23 Jul 2021 20:04:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dTzwgZMpVbOkY3vbGUChGisV1R4PJOIJBtiAuL7M/kehdoei7fP4afHS9I4lfs57/r5X6Z0qyIzRw0MtWU1fs2qFvDcwRUGIvuj5wIuoB009CHRGx+n+WXl6trp2jCKAtpbCqBhIiqtuX7tKOj4esVFZqdc/J/qmosLExw83bsUmyAd9/pmfx/0TmqFpUvD/V1renkOW6TEEHpXct05ji2K9xF3elILIolZBEiSeTKteWq0GD1CLQTCkkOzF4VwrorsBRqtjZFntDmX5zs6V7mvq8OKIthMn3Edrtl8O97dxwlYDCaIqAI/cCoqvI3KTiQ3PFEYG1X9RdJKb/vhAlg== 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=WrhFBFjdlvsR0b5954kyL8WmcpXfRT1ck+WBM7dGec8=; b=hnFyBEApJ92iFpQtxc5t6yC2QxMRuoOB27wJr3sLdFT8ubSsB2kQJyKmzBXvfvzvmskpFue/kVadKgxenS8//VJhdk4JiPFPvQomw1bX8fZVDq0T6/jFJjh5I6/xVDej2SqF+iQR8r/6Cp4zuOXagkCHav1iEXc+O+JGFesispEIZyO8+Pf/lNbJikYB4GirrG7kAdAe+l+VGhsN256eTF3fKTXHWwwB7D7zm4+1IRNCAK/bBkmmLTbiXaIUju9Hc7OzDICgM8r1q8ZOSCFuy07nrlCtmZbJESk035h97twcO0I3YsKq/XEmlq0YAt6TLnI2ifaaEuDDzIxAs8QaYg== 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=WrhFBFjdlvsR0b5954kyL8WmcpXfRT1ck+WBM7dGec8=; b=iSiW/hiF27Xb2UdNhKkbDAIOBQv01Ug68nbhpfTaskctsxUrC8hTJYTNRG6n8j/uHRhhnZ/EhAC4Ep4E1B9YmycnU+6GDTOp7EnT1zxKLCswyBsexHBV1aIT8TtqUVC/Auq1JbqUBQzUM3XqL6A4jnKnGaqY1VMHHJ0IZh/GPD5Qdbn3nbkHboiehEgx3eVimtuVQQsduXlz0H/wBQVKYoPvBkwJc3Ft8H7P5vlprE6U46pP+m8GO8NivTWcfHqXCqKUwjLhYCU41zzqUmQso7vGAh/vrKT4CQVspUF9sbyxoQj9vpO6PB/FMo/cFY9g5KXewGrHqnjIEK5CeigmYw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (10.141.218.86) by AS8PR03MB7045.eurprd03.prod.outlook.com (20.182.240.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.25; Fri, 23 Jul 2021 17:04:36 +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 17:04:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Jul 2021 19:04:24 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [zakmS6zCdnhJHPJuHtM8udm2PAB+dQql] X-ClientProxiedBy: AM0PR02CA0025.eurprd02.prod.outlook.com (2603:10a6:208:3e::38) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210723170428.1653805-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by AM0PR02CA0025.eurprd02.prod.outlook.com (2603:10a6:208:3e::38) 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 17:04:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 659fee78-d424-40f1-b5b8-08d94dfbf37b X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuYszm9Wtzpdck6zxOB5Y82DtnHkM1lPy2mUplBmvFm9Vv1gCsMPvevMdUqiQkz6AP3oyDT8umvvtvDA5zg3/CVPmu0JGHrl9yjUQDvYoKVsZEJWQI1fXVenfOtg4lULQvSK6m+vE9//U+ojpNgmwFZBX/Sp+fWbwaCs8t6IRBCLfkpr7eBGwIvK3f1uC7RQ/vYcBOhcio77xTZ3KI5lhQ2XGZthPyxFhArz/fA++i7ctnDvj6Q4y28GrTFqZV53sPN5wmKpUqSakpZzXv1qvKC/4+f3adUJ4m9+xFXev+S542dclF0IiFx6yhco9GXjwO1D1FVRbIWzaZflL9EJ2SzfWrPiT0mUsGdLC4Ea5kfW15AvRPlHRnE+i7RaRRa7IcRhubmRusgbadp1ovLNk0Tu8jdhrfdB1v3RVPsBlf4cqz6KWHIvyh8NQgwiIblvNYw4ruXMZHTOGj+D3Qx/uG/u1rAhuHllYS50qbdLTTVYOFaO2up4rzxhtNtK5oLbUq9iPa0G4fCFWgQneotTpjKsKZ8VgMCyAiG3wF5UspPw23YieDFLCDY+axN2DmeH22Hag5SEXPdYMkO4ZWno40d90u3iduDYKe0Z5ZTPXyOoRszCk5OetV32OvhK2l5OFUQMmQtvdMXXLEmzYfn9A1eXRw3eggRJcuHbfs+RRNGTnl5CJK0SeTn7+M3HYzBSsZDqDEe6GU0eIPl+PQsVemFwEC4w1G/D9xz/dcM0T2dlBhmIorxOmzshzFlwXoUkH9ONMwqNsxhVPVIRpYqAFiW X-MS-TrafficTypeDiagnostic: AS8PR03MB7045: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0j+cl1gR/ajbGSBPtlm058ZVtPKlB4IIM3sPoVvJx8+1jxVbo2kPWjsXP8rsWX3WB+8OLQrjtymua/ak0LDIcGoL/KB+0pQYa6ZP1unycj8udfZOMnTccoUKCvqc8abndjs4Cu8M+Cmj/nvFtPbe4vaUvhVeofSdIfEij5THEQMbYm0oWhE5nBfSEpD34StTQdsN9hx5ly6+pX272Mibr2luwXQ0VcpSXBT+BjGMyQYfrj+amEgaHMaGnHoetC5mwYoolJrgiGgYAybfqf0On3yk0rH4sOA37D6uyGKUnTyY8tjfmRYc1+Vg75GzvsgkDs5eJxbUsaAiiuljjBLNmVSEwmGQ+GuCzGDYQTCjhqmvZ7FeZsLyIHXruBKNsH5/0izRKtVZHxrWxrCP82VlyydbXdpHAZLqvN5/xVTpdp8zpwrenbjS+5NU4c+DoadQYc+IMCrGNJ5W+EC2CfUpbe6/+id94Rt0QJdDB9wqIXA= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7aUSGDIzj2U0EZ80hlJYHQJEMePVe3YneqozpfUfNLHNu7vRD9JJnWaZeKLUg96flerRIyCfF7Ilq7wNBZhU1P+UzHtdYdErQw6Ex88RRWgVwxna9eKKQ9U4F9jBwJ0o0G7UXyZz05OipepQq2K/TA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 659fee78-d424-40f1-b5b8-08d94dfbf37b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2021 17:04:36.8867 (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: AS8PR03MB7045 Subject: [FFmpeg-devel] [PATCH 2/6] avformat/internal: Move ff_read_line_to_bprint_overwrite to avio_internal.h 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: qq7rR3KqD5E5 It only uses an AVIOContext and an AVBPrint. When doing so, it turned out that several non-users of ff_read_line_to_bprint_overwrite() and ff_bprint_to_codecpar_extradata() relied on libavformat/internal.h to include bprint.h or avstring.h for them. In order to avoid a repeat of this and in order to reduce unnecessary dependencies, a forward declaration of struct AVBPrint is used instead of including bprint.h. Signed-off-by: Andreas Rheinhardt --- libavdevice/v4l2.c | 1 + libavformat/aadec.c | 1 + libavformat/argo_asf.c | 1 + libavformat/argo_cvg.c | 1 + libavformat/au.c | 1 + libavformat/avio_internal.h | 14 ++++++++++++++ libavformat/concatdec.c | 1 + libavformat/dashdec.c | 1 + libavformat/dashenc.c | 1 + libavformat/flacenc.c | 1 + libavformat/framecrcenc.c | 1 + libavformat/hlsenc.c | 1 + libavformat/internal.h | 16 +--------------- libavformat/librist.c | 1 + libavformat/mxfdec.c | 1 + libavformat/ttmlenc.c | 1 + libavformat/utils.c | 1 + 17 files changed, 30 insertions(+), 15 deletions(-) diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 1c0de118cc..b5997fba33 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -33,6 +33,7 @@ #include #include "libavutil/avassert.h" +#include "libavutil/avstring.h" #include "v4l2-common.h" #include diff --git a/libavformat/aadec.c b/libavformat/aadec.c index 247c498147..9771a1df81 100644 --- a/libavformat/aadec.c +++ b/libavformat/aadec.c @@ -25,6 +25,7 @@ #include "avformat.h" #include "internal.h" +#include "libavutil/avstring.h" #include "libavutil/dict.h" #include "libavutil/intreadwrite.h" #include "libavutil/tea.h" diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index 0bc09522c0..5adafb7230 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -19,6 +19,7 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avstring.h" #include "avformat.h" #include "internal.h" #include "libavutil/channel_layout.h" diff --git a/libavformat/argo_cvg.c b/libavformat/argo_cvg.c index 11f68c2405..e1854b4493 100644 --- a/libavformat/argo_cvg.c +++ b/libavformat/argo_cvg.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "avformat.h" #include "internal.h" diff --git a/libavformat/au.c b/libavformat/au.c index ff8f841cce..9bd408f65c 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -27,6 +27,7 @@ * http://www.goice.co.jp/member/mo/formats/au.html */ +#include "libavutil/bprint.h" #include "avformat.h" #include "internal.h" #include "avio_internal.h" diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index fe87f2a288..2c6d00b5ff 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -187,4 +187,18 @@ void ffio_reset_dyn_buf(AVIOContext *s); */ void ffio_free_dyn_buf(AVIOContext **s); +struct AVBPrint; +/** + * 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 + * 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, or if the buffer becomes truncated. + */ +int64_t ff_read_line_to_bprint_overwrite(AVIOContext *s, struct AVBPrint *bp); + #endif /* AVFORMAT_AVIO_INTERNAL_H */ diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 74354fce25..934e9c02fc 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -26,6 +26,7 @@ #include "libavutil/timestamp.h" #include "libavcodec/bsf.h" #include "avformat.h" +#include "avio_internal.h" #include "internal.h" #include "url.h" diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 11966f905c..6105ec46d9 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include +#include "libavutil/bprint.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" #include "libavutil/time.h" diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 2b8fbcbe6e..679e30611c 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -28,6 +28,7 @@ #include "libavutil/avassert.h" #include "libavutil/avutil.h" #include "libavutil/avstring.h" +#include "libavutil/bprint.h" #include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c index d8cf3ea4db..44c9341493 100644 --- a/libavformat/flacenc.c +++ b/libavformat/flacenc.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c index 56f7ea1b5a..ab79903e31 100644 --- a/libavformat/framecrcenc.c +++ b/libavformat/framecrcenc.c @@ -22,6 +22,7 @@ #include #include "libavutil/adler32.h" +#include "libavutil/avstring.h" #include "libavcodec/codec_id.h" #include "libavcodec/codec_par.h" diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 151ef6ec8f..6447f9bf48 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -37,6 +37,7 @@ #include "libavutil/mathematics.h" #include "libavutil/parseutils.h" #include "libavutil/avstring.h" +#include "libavutil/bprint.h" #include "libavutil/intreadwrite.h" #include "libavutil/random_seed.h" #include "libavutil/opt.h" diff --git a/libavformat/internal.h b/libavformat/internal.h index d71852afb9..002aeb6601 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -23,8 +23,6 @@ #include -#include "libavutil/bprint.h" - #include "libavcodec/avcodec.h" #include "libavcodec/bsf.h" @@ -539,19 +537,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 overwriting - * its contents. 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, or if the buffer becomes truncated. - */ -int64_t ff_read_line_to_bprint_overwrite(AVIOContext *s, AVBPrint *bp); - #define SPACE_CHARS " \t\r\n" /** @@ -931,6 +916,7 @@ int ff_reshuffle_raw_rgb(AVFormatContext *s, AVPacket **ppkt, AVCodecParameters */ int ff_get_packet_palette(AVFormatContext *s, AVPacket *pkt, int ret, uint32_t *palette); +struct AVBPrint; /** * Finalize buf into extradata and set its size appropriately. */ diff --git a/libavformat/librist.c b/libavformat/librist.c index 01a3f9c122..8f51050c3e 100644 --- a/libavformat/librist.c +++ b/libavformat/librist.c @@ -22,6 +22,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/avstring.h" #include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "libavutil/time.h" diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 52fbbc6e35..f93cc30f0e 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -47,6 +47,7 @@ #include #include "libavutil/aes.h" +#include "libavutil/avstring.h" #include "libavutil/mastering_display_metadata.h" #include "libavutil/mathematics.h" #include "libavcodec/bytestream.h" diff --git a/libavformat/ttmlenc.c b/libavformat/ttmlenc.c index 7577cb543b..8546d35196 100644 --- a/libavformat/ttmlenc.c +++ b/libavformat/ttmlenc.c @@ -27,6 +27,7 @@ * @see https://www.w3.org/TR/ttml-imsc/rec */ +#include "libavutil/avstring.h" #include "avformat.h" #include "internal.h" #include "libavcodec/ttmlenc.h" diff --git a/libavformat/utils.c b/libavformat/utils.c index 508a2b8bc2..60d7364018 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -25,6 +25,7 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/bprint.h" #include "libavutil/dict.h" #include "libavutil/internal.h" #include "libavutil/mathematics.h" From patchwork Fri Jul 23 17:04:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29039 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp1560353ios; Fri, 23 Jul 2021 10:05:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwvtNloz72v/MDLkVK0AG6DkSNgLA7Gqt+mi3+eX60jYQd0gHsBUGavJwGhHA+ALp8uAeqZ X-Received: by 2002:a17:906:7691:: with SMTP id o17mr5596568ejm.209.1627059900158; Fri, 23 Jul 2021 10:05:00 -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 h14si9338420edq.245.2021.07.23.10.04.59; Fri, 23 Jul 2021 10:05:00 -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=aSRXwZ+u; 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 7629568AA8A; Fri, 23 Jul 2021 20:04:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070040.outbound.protection.outlook.com [40.92.70.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 32DA468AA8A for ; Fri, 23 Jul 2021 20:04:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pbsoe4FeVZN2Sei8yl4stTnjgtpLcVxNQoLnY0Tbe/uG1cNGUmTvlbLiB7R7LpIk8J3WcLltmlS+s6POhWgRz4TinG/I72FhBeqHMpo/SyBzGbfY+BM9amaq8lzWFHuJp9wduFjljt2gLsOxrUIrGqJuiy9e3pDbuN6XqTTG/yIj6P0avtueIN7p9+9CQJDMQ7JlKV5kVaq3PnHdKsxYaDuTYRnOdU6BjiuVavtNj7Ax0+ZSbBCvbKBl50CQOQTpWvuU4PsfLoEZQzq/z/7EzptlrdARKQGIQ9BIkxGFlrgf6sCNbL09jZTGf6sT0/xHBWEghjkYS9dcLKGN5F5mWQ== 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=/LtT50lt1C1Q/2Vfuwg8BmvmN6kw/4LiK27ICQFUq7I=; b=QhY5tR5LnwARxmsZlTc2wBI8j+gByOV/dEoNKr7KspaFN1op/LYcdDhI0wPWr+EinsXwngFictg2QvlS18xpqJEdy4/PP6Y4v0NlCjKfBUIGzJ39TQ/IVmXRSoq6FHJm9iyJSMIu3YKFCJ2W9W4x1NRLQhqeHSfu8A4we8I86VyEiAgQthOB1LNCtItmNMMg6uEtOff7UkcVyn1FIFBSrKCMt2t9n6I9x3qspggjeWkIxFvaQ8WyzPUVghzCInmThsJ/bfTf9C2tg3xUzmPEyFPRO26Aofk0nlzEmfJBslGeJW0MGxJkJSQmKYm3ZMSI/nkZPampdXmx3nsjJXlAkg== 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=/LtT50lt1C1Q/2Vfuwg8BmvmN6kw/4LiK27ICQFUq7I=; b=aSRXwZ+uz6LMLpngImmkqVEGCoRT77R3x1RU6zS2H4P01WWNUo3xbU3ZTBMbO6c68Yba9mB3IRHrrffputtcB1coxp9X0ThzjvH7OME+Wz/4nEfYhAQSanN4iwbOuh/d27WqDmHvRi8fIWzPfGtErkmSUObJrLpV2BRSk1gxu2q03NFqBT/BYPwefqBith2gj43RnUmJVTElphTZRHk9+0sO/zgc2ThN/v91zMSgHMpTbhZScheKL3rRuhApi3A4EgSHMtK3gjDXNO4GfPAz4fjCgbf8ujB0989qwVKVzthRRPJWZk/px7TyfYwBBxxhZ0UpH6eIIVu5a5g2awqDcg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (10.141.218.86) by AS8PR03MB7045.eurprd03.prod.outlook.com (20.182.240.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.25; Fri, 23 Jul 2021 17:04:41 +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 17:04:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Jul 2021 19:04:25 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [YYxMTQs9LTf73bvKVvY5kPqK/bE+zcQt] X-ClientProxiedBy: AM0PR02CA0025.eurprd02.prod.outlook.com (2603:10a6:208:3e::38) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210723170428.1653805-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by AM0PR02CA0025.eurprd02.prod.outlook.com (2603:10a6:208:3e::38) 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 17:04:41 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aaa22050-2978-4f74-f570-08d94dfbf63a X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIe78BGW2DBzJQrWpKnvOI5zIiWyhgJm4vW/bnQYtUvFZmMsgI2wxlarSmbMieHVv0U1owAtaMaD0k0zmH9CP8Gbj2MXVaIQ5unwwA7w/EK8vdKPl4nF6iUx15h14q36Oj66i90HAoqFzCpyub0Qmbj89uC0BJB+0USWGSIf7NmUPgUKDGjPrtzxY4RNCXGh+Dr5yWNKXsS8/C8eWZgIPA5yzGHd+CR3k2VR6b6yeOdXbMJhbzuXUfm+TB7HVHO3HhJGDZifapUVQ6Zk7IN74nARGvF+SIiyS2xRM+cm7h65azL5b1W4nWGg+ei76hRK+Xv7NHpqMk7qXSpvmKovKXltj1M4yH34pNnV2aQL7gJoh99m2z3tPOhIgL048dzn3DXRIj4UhF5bSK/LFc0mv8nyNL2Bz9zVPBVatTGo2uapN4UcWFbKfUFmtmVdhseYEkIORf1gnP/CXMgsySkW4jeyBWjbjTSdxOX/9FqmCzMuvt+nagQCyObXcdMA6QEjcxtKFso0MK2t41dCvENGR0e5dkR2KafYilBL+O5RqtItSquew9Fol4jFYcC7gGbQNzB4fN2n449s/fmWXbMvRU9+OYcQAo8qB9jfZF1blvRed99OkJkwsDAKuRpXk23lwiyMXU6/ZYhFQ7djl/kTgHI/qCWBF3v7HWoW61FNuXmoFvt6MiIROuAKOj5leEUgJBgJzhVd/0M4Q== X-MS-TrafficTypeDiagnostic: AS8PR03MB7045: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eM6xIUfrVr9nDS7tITgiDgTpQoeoQfkFVlHzyJPxM527jIscDJdlGnEUwkXJui0Qkff4NQe+gie0DHPYEix70hoHwwuNcdO+AAwmNYGEgUo6YCwkKP8BYMlY/MnCgZ4Dze67LILV21Xa2t5UJ97fbfGUXCBgairypzLH0f/a8ezKfq1DdSOmFfH60G8gw+PJN/7mNOMtKmMuA+CgOj5sdpncd1hG2qP0sSzr7j02CrtisTOIXjmrmkXo5y5WyrQaf93xgFPgJohSUfo6k+kxa99SzRTS9neLJRGDCvn3Vd8+momNIUoRuC235k1mN8ohc8XlZP4K9aBbEGW9B/UnAecnBPZHbY5VkQMFC52/dSfO+GJfLSUm9cHRnqxa59Do4XV9qdsANbfi8ZMy198T1oVkJcIRzmzMmNPzNIhzhhP58QF7JhIar7aM6rqZFl5h X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: x4iWExCxbKD5Si9y/qsfxCDMaQPbp1Tth/zupLWz+NO4Ul248SMTqnk1L/UeEb51qODYjHk2cgjkgTYPFemrl8vs1vK/tWuFoyJz6xl/Mk80rYq07HPyouYGK1h6IsytaJJDlcm9zRIpOKsbHaXyiQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aaa22050-2978-4f74-f570-08d94dfbf63a X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2021 17:04:41.6419 (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: AS8PR03MB7045 Subject: [FFmpeg-devel] [PATCH 3/6] avutil/common, macros: Move several macros from common.h to macros.h 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: DRtreAKOfCgc common.h currently contains several things: Math macros, UTF-8 macros, other fundamental macros; furthermore it also contains miscellaneous math functions and it (directly and indirectly) includes lots of other headers. This commit moves the "other fundamental macros" to macros.h which is a more fitting place. Signed-off-by: Andreas Rheinhardt --- I am unsure what to do with the other stuff in common.h: The math macros and the misc math functions could maybe be offloaded into an intmath.h header (with the current intmath.h being renamed to intmath_internal.h or so and included in intmath.h like intmath.h is currently included in common.h), but the problem is that there are also float functions among them (intmath.h also contains optimized versions of these, so maybe this is not a reason not to include such functions in a header of this name). doc/APIchanges | 5 +++++ libavutil/common.h | 29 ----------------------------- libavutil/macros.h | 30 ++++++++++++++++++++++++++++++ libavutil/version.h | 2 +- 4 files changed, 36 insertions(+), 30 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 9506059ac0..cd1902179f 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,11 @@ libavutil: 2021-04-27 API changes, most recent first: + +2021-07-23 - xxxxxxxxxx - lavu 57.3.100 - common.h macros.h + Move several macros (AV_NE, FFDIFFSIGN, FFMAX, FFMAX3, FFMIN, FFMIN3, + FFSWAP, FF_ARRAY_ELEMS, MKTAG, MKBETAG) from common.h to macros.h. + 2021-07-22 - xxxxxxxxxx - lavu 57.2.100 - film_grain_params.h Add AV_FILM_GRAIN_PARAMS_H274, AVFilmGrainH274Params diff --git a/libavutil/common.h b/libavutil/common.h index aee353d399..3cc1f07566 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -42,13 +42,6 @@ #include "attributes.h" #include "macros.h" #include "version.h" -#include "libavutil/avconfig.h" - -#if AV_HAVE_BIGENDIAN -# define AV_NE(be, le) (be) -#else -# define AV_NE(be, le) (le) -#endif //rounded division & shift #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b)) @@ -89,25 +82,6 @@ #define FFABSU(a) ((a) <= 0 ? -(unsigned)(a) : (unsigned)(a)) #define FFABS64U(a) ((a) <= 0 ? -(uint64_t)(a) : (uint64_t)(a)) -/** - * Comparator. - * For two numerical expressions x and y, gives 1 if x > y, -1 if x < y, and 0 - * if x == y. This is useful for instance in a qsort comparator callback. - * Furthermore, compilers are able to optimize this to branchless code, and - * there is no risk of overflow with signed types. - * As with many macros, this evaluates its argument multiple times, it thus - * must not have a side-effect. - */ -#define FFDIFFSIGN(x,y) (((x)>(y)) - ((x)<(y))) - -#define FFMAX(a,b) ((a) > (b) ? (a) : (b)) -#define FFMAX3(a,b,c) FFMAX(FFMAX(a,b),c) -#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) -#define FFMIN3(a,b,c) FFMIN(FFMIN(a,b),c) - -#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0) -#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0])) - /* misc math functions */ #ifdef HAVE_AV_CONFIG_H @@ -475,9 +449,6 @@ static av_always_inline av_const int av_parity_c(uint32_t v) return av_popcount(v) & 1; } -#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24)) -#define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24)) - /** * Convert a UTF-8 character (up to 4 bytes) to its 32-bit UCS-4 encoded form. * diff --git a/libavutil/macros.h b/libavutil/macros.h index 2007ee5619..2a7567c3ea 100644 --- a/libavutil/macros.h +++ b/libavutil/macros.h @@ -25,6 +25,36 @@ #ifndef AVUTIL_MACROS_H #define AVUTIL_MACROS_H +#include "libavutil/avconfig.h" + +#if AV_HAVE_BIGENDIAN +# define AV_NE(be, le) (be) +#else +# define AV_NE(be, le) (le) +#endif + +/** + * Comparator. + * For two numerical expressions x and y, gives 1 if x > y, -1 if x < y, and 0 + * if x == y. This is useful for instance in a qsort comparator callback. + * Furthermore, compilers are able to optimize this to branchless code, and + * there is no risk of overflow with signed types. + * As with many macros, this evaluates its argument multiple times, it thus + * must not have a side-effect. + */ +#define FFDIFFSIGN(x,y) (((x)>(y)) - ((x)<(y))) + +#define FFMAX(a,b) ((a) > (b) ? (a) : (b)) +#define FFMAX3(a,b,c) FFMAX(FFMAX(a,b),c) +#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) +#define FFMIN3(a,b,c) FFMIN(FFMIN(a,b),c) + +#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0) +#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0])) + +#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24)) +#define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24)) + /** * @addtogroup preproc_misc Preprocessor String Macros * diff --git a/libavutil/version.h b/libavutil/version.h index 77ca4becd6..6b4a265457 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 57 -#define LIBAVUTIL_VERSION_MINOR 2 +#define LIBAVUTIL_VERSION_MINOR 3 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ From patchwork Fri Jul 23 17:04: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: 29037 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp1560506ios; Fri, 23 Jul 2021 10:05:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyS6LbxqXGvHCouf/9Y+cs+ae2MvTNRuTbkwKrGX23F5/i7I5BMLSEE51kL2T+x1RYSLkyy X-Received: by 2002:a05:6402:487:: with SMTP id k7mr6555829edv.315.1627059910194; Fri, 23 Jul 2021 10:05:10 -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 i11si43775735edb.418.2021.07.23.10.05.09; Fri, 23 Jul 2021 10:05:10 -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=PcXfdpl7; 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 866FE68AE3E; Fri, 23 Jul 2021 20:04:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070040.outbound.protection.outlook.com [40.92.70.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4BA5A68A3A8 for ; Fri, 23 Jul 2021 20:04:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VwC3rkGcHmKC691uEx7Axd7AaaCs1NR5tgacMA95qlQOPVsI7gMrOK48aPw+d18JxJ5dpRYa1mkKwdLZtL1RCbBaknvQ4ai5zJNMXIFF12a1Z5uPUUL/LzPa4ElStLNbvblHzJ54yLQ14nyE+cV2ZBaklyXZgqtKTm+uzC+ysc/vWWDw7itpOHkkrnQe1XA2Z8GWbJyxkFHVgCvvvNSqfNjEN431oEEM/k/u6zJ2e7obtbQ6PLfI/f5uQOtkbzsZ2VbOJkphDPFryd39a9GhEbLJxylH95AyJAHqje7oYb+CJ/4o0JBf/t8ZaJ5dKzzw+3s2KNI1lb0U1IzswtQqrw== 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=td9mCz1AZkD44u27IWYAjGWmkxTMRjyftLp7I960Rko=; b=RgbPYPOKjG7re0D6rwKEuDLEsjOJ0S0M/lXPXhQ3ilrx3QeI9ycm0JE2oDwpqdqrvj584YZMPaomdgulwKO9b7pIseFCGGPYk17WWtnfjrxa7auuy7BMKxNuzjZ/KBANzYjVK+kjItScLb84YaeIKsK4duasbXhkbYTXsG5FmhPEU4Y6D/8yiIVBMC88kL7vPUF6oP4sEgcRjAMQUHT1uYZxiAI3hGUbbw/tEiOfHjJ27qSu1GgYaBDfE9dYdUhnkb5RP9Gi2+wAiWP2eU6KNTenh/dm85h9K1w+D4o6+9/jls4927bnHC5ChDtKzmSKBd8fpF8lxn7qptEix/f9eA== 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=td9mCz1AZkD44u27IWYAjGWmkxTMRjyftLp7I960Rko=; b=PcXfdpl7qJK2PeQpD3Vd0yNuK0gjvMyVZ5lG9zdHdWZ5brPOftxbx0KZRh58tpby4Wv2DqnJXhHHkYZTPwpT1GR3DBKOX+vAUp4/j4ppTcWSgQ8RFl8fdVAFBxh8oYoW/twJ57wmEW/MAbV7zUX1mAmgqSwd79X0BQxFtrPqZa7mBrfn9Bl35imVbMVkEi0fI2a55fEiBaSIVGBmzMmxxZ00Mi7XY3j+3+hdgXuVLlhkAwYlhkIYN8zyqm6e4ltcEKtneUN7idbkSAde/jSWKsevMcZg1qoTWG3m8IgACLyCuxDn4jbSwaY6pM/JDA1DwsYgjiyobgACRoUkd4EcnQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (10.141.218.86) by AS8PR03MB7045.eurprd03.prod.outlook.com (20.182.240.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.25; Fri, 23 Jul 2021 17:04:46 +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 17:04:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Jul 2021 19:04:26 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [1nl1q5OttC8OrA0x+LZVTMta9/oyuawD] X-ClientProxiedBy: AM0PR02CA0025.eurprd02.prod.outlook.com (2603:10a6:208:3e::38) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210723170428.1653805-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by AM0PR02CA0025.eurprd02.prod.outlook.com (2603:10a6:208:3e::38) 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 17:04:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fa262c88-9a60-4e1b-0f23-08d94dfbf961 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWNJCVVftkhZzWXFXD9xH9lbcvfbLe3JchQxIZX2GzExpTWekzxcg/6lOJg5+8rvLIVt9w+Q30x5v7l8Fg+0zQ7DCAEJPjV2NSQ6Ve8BZ45IWs2mYkaI3rRHUxCQJfvDBgW3vL9wtoaJhI1OfxZ097Vt9fBY4c0fyjJxfodq8opOMfe9aQpOGh2A0vn+7zQdz6TVfWLGYiQFhtBs2rtlU6jF8Nu+iL3pTnYE8QSp25nlLn7Hdv9tmZgne9ig7hFlMop69au4tB4HHJKrMVZ2IyBeGEbdSvcQwVMsWcb9gjAyn02OSyM1Bm4lXmHmPBJ67p8NM3/xE6MYZS+a/bAP6++Pqoe68kF9hQHiiP8Wfe4Hqmzlqpz52b6j0KfVOvbzXTmQfRePIfesXDIvmBzKa6PYsH5bjjF7X4gMRO4BZBmLxta6P2BkqNl52D84lY2MDGvbuCw7RYddtFBCQrgz3au1KZjC9hD3YwyWF3dDf2DrRtcZHU3qcA0WqbEmzCqYIoMWQ/g8gjFcGBX+5H4C7Tki5iy9wQkFtrX2zB+bT6MvNLxwz4q7IihupC4m3+JD/BcWbtMysTayqEGzMicHbmJWOH4Ma6y0pmSkN5LwuCGB/o9oSjfO405nQ15MLrGUUBf37sAVQqfu7ltPWk5zEd7hN1CxWA5nXh9CX4ov53xdFidHkePGYzR0Ot/0obrxxXKRRJP/dxZGSEhZZV5vPGpDY+Eb/sM0XA= X-MS-TrafficTypeDiagnostic: AS8PR03MB7045: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VZmrP8UHd1Yw12bm1yD8KAPT9F8kq8wGhnfgDOrW1Og6ZwoXErtEUscYlAjwKcA43Ggkb5kgwSdOltC2vWqQJCJyq3KbFJXINLb9z3I/7wWXdS5PJJgxXFViFoTu/qMtcfROzH4lhNlK1jyLwzVRj7WQYDczsvBZ8qrDVbEsAcuw2XJ+FsvkrQxTcgFnqQ0s3t9Q3fqekTCGasYg0Na9C72Go9qffVYryjdfNfu5kG3bgw4n5Oqygy7dK/aFdR/VHgJToHXAyR2uhac/HUurMhCt+99xnaq/Lc8V3GRA55nFy+/cRGipkmutapChqqTJs6VwceUIzD7UWVsJqBw+Edz+aIm3KFwLkm8upA/Z9hWNRkjBCPiMoqKbw24YBAKYdYpi1VR+vkCoVwQZ/uYR91v9oh6C17p5Fl/2xafxOE3nZDPS5o1vP+UPk0nJ5pSi X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Cmc/Itgsn6UiIaUq9mYx04jleEGOLk5eK1aux3h/Pkr7ZAegytaxUsVEwuLQCIipKWd716HQxNarxeJBNVyDbcdGDktNKLAMqafWkr0cn5Y+MiDGnQ02jVATe+H3Co1L+qsXdT56bmATq5w2ul7DGA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa262c88-9a60-4e1b-0f23-08d94dfbf961 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2021 17:04:46.7873 (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: AS8PR03MB7045 Subject: [FFmpeg-devel] [PATCH 4/6] avutil/error: Include macros.h for MKTAG 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: 4fV8EV4c6qDF Up until now, including error.h alone does not make the AVERROR_* defines usable, because they just expand to something involving MKTAG, but without the header providing MKTAG. So include macros.h, the header providing MKTAG. Signed-off-by: Andreas Rheinhardt --- Since 580e168a945b65100ec2c25433f33bfacfe9f7be one could also have included common.h. libavutil/error.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavutil/error.h b/libavutil/error.h index 71df4da353..0d3269aa6d 100644 --- a/libavutil/error.h +++ b/libavutil/error.h @@ -27,6 +27,8 @@ #include #include +#include "macros.h" + /** * @addtogroup lavu_error * From patchwork Fri Jul 23 17:04:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29035 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp1560847ios; Fri, 23 Jul 2021 10:05:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXYtyYwZakjf2cRPIRntkFRlSY6Bku2ePiIV8NWFdjIrkiwLSj1O7Y6vi4zEBDJWlGCnkK X-Received: by 2002:a17:906:f294:: with SMTP id gu20mr5634184ejb.292.1627059935053; Fri, 23 Jul 2021 10:05:35 -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 ce9si30507086ejc.253.2021.07.23.10.05.34; Fri, 23 Jul 2021 10:05:34 -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="lC8G/Swu"; 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 AA77368ADF9; Fri, 23 Jul 2021 20:04:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070040.outbound.protection.outlook.com [40.92.70.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6428468AE42 for ; Fri, 23 Jul 2021 20:04:53 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oB1SSGXiiAjeWLaeuuZADrtwLobPAMy2CA7yippycJEznaCLvHXj1CBPkISlV7Sk1rD0qiaAZ39x4/Pzg4nZ4hfssniFLv4mn61oPuva+5CkHVuyBtNb4MZFgIVfhHAFtbV9JJx+d/pNWydShpZ51+CM8SuN2Zjbvt+5DWyDUP3ziU+U89VO+BHaYdt1JqMvKMXH6+XbEKz3ktUEiATKedqU7W8rrhOBoCAP4cCFbW2rH8vViAOGqoETpOnNiIs6c61U1LnszUQ/+rwkzhiOLOKzXzAE79RsSms8fgrCqCbwCwSB4xX+K/pyW4q+dY0i9XZ9LyGuqbXyI8ptL1BizA== 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=kTj+41BjnEejj5sGcpVCOscmhoVjBeTNrsGR/fGcMbo=; b=mDf/WMMlKRPp5MsdPRRIx+9DlWOpsIZTO7IS2qyDiGA0NCQ6MOMRcSnc2VN3VY+3+Ts8FOvY33vPdhUlOC1ah78c1/lYkH3sJBNAy3Bwd6R06VZW21EBWaB+y62cBFs0smOhH9tCKKjVJt2Lk42kndrd9PE+9U0NsiPMS15+v01CjoOGOmtqMx6dwo9TVYYU9qck+cWmLZFPP95T5c+JBrHKVmFEd5qKXP5N3KC7ZB1ODzyJLfciNXTYDyDTIsDVimn+sqM7f/fXdmoCXYQcjYLyqV3sH9a1HBF4Xwr05z5XyHAYPNfNQ2a0mYzXA+h4hqrNM3qe+qFmgfVzOAsBMw== 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=kTj+41BjnEejj5sGcpVCOscmhoVjBeTNrsGR/fGcMbo=; b=lC8G/Swul+CMST51ccTQugyAPWTNdm5u5oUTdvBaS5j34sYkk3u1RFCaZmw+5irCLx4ebCUSfXingFfxPlG12Qv+JhdgkhNMHtN+0Hu2zDK0z652cIXLOaeYHiM0E3moFmvwQW0fTjg0XAuXV3DcFuQ+pmwj4ycQaqSAYxho+Cj4fhxSegNvUgmAhEsOgrrIqaONYEQi0KKXpeZY9UkBAfODWNf+rTlpdUsjW0+B4KAjffu6Dt/R+Ai03kwSCoGDODQWyKtG7yvQR8odBh3C7NP+jqwVYezqP5MDTeP5BBviLF9/EgYY8lLNJsmNZpr8wTzNuO6Fi33Pjk4qCuGRmw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (10.141.218.86) by AS8PR03MB7045.eurprd03.prod.outlook.com (20.182.240.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.25; Fri, 23 Jul 2021 17:04:48 +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 17:04:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Jul 2021 19:04:27 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [+pbsJc+5wwcVLEnUuPD/co1Y9sFMTT+2] X-ClientProxiedBy: AM0PR02CA0025.eurprd02.prod.outlook.com (2603:10a6:208:3e::38) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210723170428.1653805-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by AM0PR02CA0025.eurprd02.prod.outlook.com (2603:10a6:208:3e::38) 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 17:04:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6dddfbad-5ca5-415b-71d8-08d94dfbfa29 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSTXlfHHyYgl0A+SM0x/gy9OG6IRTSKWWl9j5lfPeqyxFAVhAJX9RTPEYm8Tai9y1bsBFfSggdNcMhHPHC8RlpM86+XxpgWMN077uqoIYJgYJeituryA19gbZwWBOASqQolmaSpzilwOq2GT0vNwyUxBffIIR5Cah5ihUTAHhbmGwO2GxRQDxH6mA1ug4qth0ANZA98IFIF92cFERXVLHdmwZF/qv4l5DAhwqJ0Yvy3rrFcnXoWFLAidyPFACMm+tkIaah0GdpAdP6nxAXiyxidtSJN5yvy7ngAk251auNKOFAKHQBwJ7nUqYjFrvBGxZFAeeiHf9B5XurhKk6PhjeebySxAiVSyWKPdQqbZk4dlE19QqzvQfoVqeS5bkwiKhf+XTFZvEM5EJ/Iah3i5/R3NQB7ZbuVwj7MdhM0xLwR2KJdpmVGfdTun8RDmvr7RITPwkVTkvv0TOm+Ao5JL+fps9nUx7vsJS/WgNU6A6xgWmEaGyRi0in+ADTSfghwPBuLvhx2TXIb3QPFQvXSFGXq1dnH7EKHWFTDpu/MfJk2YT01/PnF/Pm2FCXPtIjiUQqt1WVXq/taJLJsDMIHVEftb11hAUr8WuSAeJrkQUvdO1ezPujHnTlrf29hozzyolgCIqeXcUgTygVfDFgh1w8gt8qIIbOzT4cAfooNoXXHR5Jhe9xmK3xQLbif3x26KNFi0Yiu2OzojEJ98DmFvm0M5dzNILtY0cog26Dz5r2XakBsy/mREMD/KSsbTw8ORUU= X-MS-TrafficTypeDiagnostic: AS8PR03MB7045: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WYJSlUXOSTEEhLhqqnXj3qqcLw1qLuYFQ/sbtGpHXBexMWnCl3SfV7v+kLOzUK1n7gxB0DVRMLzQkZ5SCWyREfEGO9L7wGx2fqM7n3uk6zb8YOBv0eXSUNGlcZxtGYKNzw4ovkP82BfKy4Qs79/b0RTf+3xzLNOa8+yVU7hoXMBN/e/E/WOVavwGF8RppRE3Za4cfubpNVzOP/w4TyPUaqr95OBh7v/jngoC51PQMGClezDkC7bO4ekABFdqJQJqecZSl65YTMuplkTB6RPOJdCU+Jij0h4dXt/KUR3d5WDVZ+eaOVQSItTWnbCre6zuh6f5lCzfPRQtwMl5/W3+JEdREj4LJGJV7Jd19Q6Xut9Z2is5lLgzW0OeaWdE4Mjs1fjHQNVyFCo1ZXZAwb/6IRz2zIUw4plsccTymzRXfuD+50AnyUelIauy5XRRm+86 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LKxHpnVwtY1SnvUjIQOl5xEZOwgsPVdLBmymUP151dXAj90DSsmjlW5cEZUMh2U3TP2tbOtHDw1V4TnEymUpq53gS2uz7cNXI95BWxItL5FvNsAkgRFnxnPG8pkUMOvc88aWS5Mih9Tu2GoL4iRgMA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6dddfbad-5ca5-415b-71d8-08d94dfbfa29 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2021 17:04:48.0946 (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: AS8PR03MB7045 Subject: [FFmpeg-devel] [PATCH 5/6] (postproc|swresample)/version: Don't include libavutil/avutil.h 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: H6j3jLrRjV+r Instead only include libavutil/version.h; including avutil.h is a remnant from the time in which the version was in it. Signed-off-by: Andreas Rheinhardt --- libpostproc/version.h | 2 +- libswresample/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libpostproc/version.h b/libpostproc/version.h index 3819b68997..e518ccf810 100644 --- a/libpostproc/version.h +++ b/libpostproc/version.h @@ -26,7 +26,7 @@ * Libpostproc version macros */ -#include "libavutil/avutil.h" +#include "libavutil/version.h" #define LIBPOSTPROC_VERSION_MAJOR 56 #define LIBPOSTPROC_VERSION_MINOR 0 diff --git a/libswresample/version.h b/libswresample/version.h index ed7ce529d2..5f0d69228c 100644 --- a/libswresample/version.h +++ b/libswresample/version.h @@ -26,7 +26,7 @@ * Libswresample version macros */ -#include "libavutil/avutil.h" +#include "libavutil/version.h" #define LIBSWRESAMPLE_VERSION_MAJOR 4 #define LIBSWRESAMPLE_VERSION_MINOR 0 From patchwork Fri Jul 23 17:04:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29036 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp1560653ios; Fri, 23 Jul 2021 10:05:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybc58cCKqgN7Nva2EuEKuSmzsdnxg3U8TWQiO/ElxzAVlcAmAZ+3h0XEHVM2lo+GjrhYmk X-Received: by 2002:aa7:d457:: with SMTP id q23mr6651856edr.324.1627059921248; Fri, 23 Jul 2021 10:05:21 -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 jg9si37003575ejc.230.2021.07.23.10.05.20; Fri, 23 Jul 2021 10:05:21 -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=ADmZWcwk; 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 935C968AE42; Fri, 23 Jul 2021 20:04:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069026.outbound.protection.outlook.com [40.92.69.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C475068AE35 for ; Fri, 23 Jul 2021 20:04:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mTJH0uhssUW/FZqAfXCvX5kOm/iDk7a/6lCLgMYpXKrwKy76WuI5I7omDGBE2Nv5frhgEHv++WmI/0KWTBYoO6IqJIKSQ0uVPAc+NrEWOLhiwULfwc8wwC+B+K4ee1KnWzU7d/pRNmh0orFKMLB6o8dYJLGvdCK+YoiXE9VVbiqWMlbeiyNMh6ySf6AS987yOPta/0znFEzA+nZnM4TBLuySePYQ0Aq33ExXEj+S0YEg10E9WlE61jSosaJKdZlKrH5jqRn76zBEnPN4Dcpxs+ca4sn7DjUE3wX73bG9v6BWzFWQV/ScGYq83Gbh4P4CxzZsE4pKEKfdXgl4KoiGPA== 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=iZqfIMis+RfOttKQ2U3XW4RJN7k6I8bDPLzyvDNV9jg=; b=YNL+EVwaK9TK7KOv4NoICsyK0eHXITNoXRgZkoNNGIM8aWv9RyxTqIIIwTqwRe0/eTHDXgRMtneqHfWHad1sgAMjmxlu2WUr5r9GWv6lWF3nAaKnB8QIN98OxHtHxkPkRzUKgApEpSrkFXI23nvn/5OHM5s7je2fet9n5kByqY5OiwzrpAdOfNQ7Qy6X0KP7RxWrlsuJTDS8qF5vMpcFYxO1DrkhbM5m59SUEJCvpvGKVD/k2Iih0VN7Fn38fVBD1OYhR8PfX3pm+ynFR+7cx1Mhv9NDANUtMaG/b35k8fEGjUm0W4CpU6ypBG3E8/rGmCyS3JcgXL0Y5sJyNheJBw== 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=iZqfIMis+RfOttKQ2U3XW4RJN7k6I8bDPLzyvDNV9jg=; b=ADmZWcwkPoB/62NZLUFCptRd5GNzAEk5ZAxSF1KUhc7E8YDtxYfCL+iM28GY02syRtHX8XNeux8xvhTgj2jkkClZoZRJHcu3yp6uscXuqKxJaXpiucR3KdzMgdCfyfODwzbyGnCm4BxnGsRS3m9bnV5qIQIi9P2b/2j7x2IL1/LoOzasFNBbtGWmcbD2EvxE0k1pJy53kqnhI6jsnMgaTtANHxFKPCoRxePI1tXQ0ETUA13K2ZIh5yV8Mg0+UEOqpVm4UpIrMMLgLi6cJw7U92RcVrWkNb0kYUmf4MNPG7QWQwCrnUVM07VeUpEwBRlgl2Z4JDPM896U1t+CHzgz2A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6760.eurprd03.prod.outlook.com (2603:10a6:20b:294::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.24; Fri, 23 Jul 2021 17:04:50 +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 17:04:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Jul 2021 19:04:28 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [iKrrRyFHasIzbeA9F/ogiyJJ9gDDMBNf] X-ClientProxiedBy: AM0PR02CA0025.eurprd02.prod.outlook.com (2603:10a6:208:3e::38) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210723170428.1653805-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by AM0PR02CA0025.eurprd02.prod.outlook.com (2603:10a6:208:3e::38) 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 17:04:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6a41bc4a-cef3-4828-4496-08d94dfbfbc2 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIe78BGW2DBzJQrWpKnvOI5CU4qWv1VrY0EUh+RkZXbC/rUFPZsMDtWBbZ3m8O2MWChutRxwocPsFvH1MD8S+ks30j0eQp7EDC//uhhZLB4IxRyPCNPkUS7Bd0+3Mz4MnVoJvtyAoPamOJL3MECUXdJMFt4x8fcfSBkdJaiAMQVKIkPHlV8+qtzIarPByA3pWgO1PIpIYKChSeW9qY3SaH4PmAG3GjDF56ZKv9j/MldXtTl+OsYCVknBgpnkz19cW/VRyUbus8LxEuSFAu3NReQbehtVm8XTpg1HnNGsmuT1wjnK/lnIX4/2hgLKwfayqhusD0IppRIeMt9kYDLnWMunKCDfKpRoYwU+Qf2Kzo1g/nwXCyls1Gv7ZIeMVS4xN2E1CnwCTgNPAfyEG9wE6fqYbgVCyYs5f9/81c4kfr0TT8LQXR4GjSz1P6G1It+hFVWP81QdGzD3oxAZMA5tJ2ANkz39k6a8OoYjBvH00ihDP98bUnuDXncEC2Ag5PoEE+bY7bK2j8679FzqQzLA4eNUrxTAjiulHPyrUxYmxv3fMWAdVQ8lYeI0VUCRirGJ0W9w6DFDZrN6sdOzIZHgdTkKwNTm4tqgCzhjyroh2dFDl48mxuZVP23wZuQ8J+RDrK90azKS1WmT2Sr+gNu2wHOBlMJkIyONn4pF91Bbb8sr0Zjslbl0sxKEFfUFPQuSYcrC5M6D3MiUQ== X-MS-TrafficTypeDiagnostic: AS8PR03MB6760: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j0tXMHBjx1c12jW9xAW7PYpCCSdAd6BBp2+PZdPil6fHSgQrbJ3D+NJrOuh1h0Io4sX9+ztrhkrJ3Qi1hDzkllKNyrMoGwgDdOf44ZSmaXLsBZ90qjjPtUdE+Kxxy0NHg7pv1Vlqb8GhpM5jYAx6c4E7QyHnc8X1qimane1vWzDEnb13180AAOLXtJH5ZX6c14GcI42XGXmD8PjAjRN/GCYo9RAdNqtb/G9MosWkPO9nbhGCi6PM/Dy1Y+Wx0aO8/FZC1Gkm5bkcpcDVwVV28zGFAuvxY39in5TV1YTkOPVG5l4vNCI6s7f9+I4Rb8jokBIirYSBY9P9PxSTvssEOdLA7hISE+BJ7HMe2CVmRfo45/xQNXYgF5E1kkHQww1ocGYDPXHVa/5C0K7sdrJtOEJhcEltTVSDmY5yDEwHjV4brkpkvvJ+/WLyejAO/w3D X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0cnSI+ItfTOhmW/vPL/yffp05KHyDEdQhrTOK1vbBPD04kbACH1itDpORL5NYGvyWM4f/QHDPMjw1kDtAZXqQLOkZPmpfq22hnh4exScPu3pF8uD8kPgS6idT2nwFbV/PvMiHKkm/W38/50rq1hsPw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a41bc4a-cef3-4828-4496-08d94dfbfbc2 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2021 17:04:50.7709 (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: AS8PR03MB6760 Subject: [FFmpeg-devel] [PATCH 6/6] postproc/postprocess: Remove legacy cruft 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: U+tHGCq8hj+4 Signed-off-by: Andreas Rheinhardt --- libpostproc/postprocess.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libpostproc/postprocess.h b/libpostproc/postprocess.h index 348ee7cc61..ba456cf3e0 100644 --- a/libpostproc/postprocess.h +++ b/libpostproc/postprocess.h @@ -58,13 +58,7 @@ const char *postproc_license(void); typedef void pp_context; typedef void pp_mode; -#if LIBPOSTPROC_VERSION_INT < (52<<16) -typedef pp_context pp_context_t; -typedef pp_mode pp_mode_t; -extern const char *const pp_help; ///< a simple help text -#else extern const char pp_help[]; ///< a simple help text -#endif void pp_postprocess(const uint8_t * src[3], const int srcStride[3], uint8_t * dst[3], const int dstStride[3],