From patchwork Thu Sep 23 15:28:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30490 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp569267iob; Thu, 23 Sep 2021 08:33:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOaHaqzwo8wCXISvz2yc4QgEaLWICOV/HnufXb/6Rr54fSXW8Fya3tJUxjn6C1okWfq4XK X-Received: by 2002:a50:fa89:: with SMTP id w9mr6385578edr.113.1632411205648; Thu, 23 Sep 2021 08:33:25 -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 v14si5584559edi.151.2021.09.23.08.33.25; Thu, 23 Sep 2021 08:33:25 -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=R8Vbd0mR; 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 0223C68A94E; Thu, 23 Sep 2021 18:30:19 +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-oln040092074076.outbound.protection.outlook.com [40.92.74.76]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BBCE768AE7C for ; Thu, 23 Sep 2021 18:30:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JbHphnhU5a2DPByFvgSwgw2kcG6Vi3wMe4cX1nU/YERr+GkRJJ8+s9COSAL6IGTg95hnx66Aep8YD8zwzBMTlb13LCLPh6ZnPCAlcVNjcDAlAuof1s19c+idjz59WhdXDtZAVsI4o+s13v7WnAfpDu+HeAFKSbjgIAUeqlV7xfUxaOpUM9u8XsqQYNcGbY+4X/8rjVGJrnlXCfCfVSzSSu52cKjUyFfMac0AXcshNNF4EVPMQG1qWHtT/vl+ZyWyWAwAkXwja4uzg5z5uVndxDfMKUY670Yl9NZmxguSu+GFof/OjAqREQWcmlAosYJZRHOAxndwKh/Uh7pq9spp5Q== 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; bh=9lNLV9xkZHWzRoyo/KLaGePYmiFikp+KulJ9oOWfAYM=; b=LgyBq3kdHoILd6BEkE5zJZEiUzV73j0lqoEFmDjUNu8WogfgcyQLThPIKnilst40CzNhfTwjzlPFK7d8NRFvb0XAMgY6tlBHveJk/98oWzPgYuxZGENNLxMfWhLp0l1iHWbQMLPaq2UPosAcslHGwCAEqFQFlDrx0R92c6cfoJJZZ1m1Zoausznagni9KdnM8gtO6h71yCS+9j6Enw8cdtVDmq8GZJMQ/qRebUHLtNj20u3ltoQCpzE1I2YLFdPxBT5eZ/mQcYRgwvoyleRzxRWXlUxat0KVyHWvqIbBwz+lIhuqIeCV53uEiyERosFWgp2hBCHfpTlDGhLd7HBdvw== 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=9lNLV9xkZHWzRoyo/KLaGePYmiFikp+KulJ9oOWfAYM=; b=R8Vbd0mR2bfOuUxH/7KBaUm7HMYhChBsn6w5hkWjdk0oXfOAOLr9D8Vv5k/BpAU3LtMWcY8KtIPlFeCcbvaljW0Vx4lud8514pErqaFt8blCot0sJ7fP+vCymA3Js6W/x5SP1KQnFd3myI9p7CuwwDov4WK3+J8zeC+9pt/9ALrmuH8VtCr04eKKmXX2lLXYVew2CW+FWSBtdk9/KO+DWGsPIVaIkBmRDjtPo24uxIrhSSqdfoOELwi7t6VvyuVDNYBhcBxT9eFvUETxInXMg1rT05fanw6EtZjqY+OrR1+axx/fJbe5ICqszZWlOGhBeaeHv0tjKPo17Bsin7YQDA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5172.eurprd03.prod.outlook.com (2603:10a6:20b:c1::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 23 Sep 2021 15:30:15 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4523.021; Thu, 23 Sep 2021 15:30:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 17:28:59 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [AoJWMwuFzSROc0+Zoz+cVuKu1mgEX7fo] X-ClientProxiedBy: AM0PR06CA0106.eurprd06.prod.outlook.com (2603:10a6:208:fa::47) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210923152902.42865-23-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR06CA0106.eurprd06.prod.outlook.com (2603:10a6:208:fa::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Thu, 23 Sep 2021 15:30:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c97faf2b-73d7-48b0-10f4-08d97ea70aa5 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWt8qMG3IjM1pM+gnFiFAdPHZVn224UeRe7ZLVEpzdZOdg1tY8YFdYLJLdQdUCA15vMQZm7CrfeentqBS4jbPPoULEv/TFCZER7FLzKgwpDDwq7NOZ+HZ2CGY+WHLduwF1ym04u1efdcHx4im0ZrtPtiXfszRSeyKCUdQW9upRzwueJ2VOFW6IhlWq/IqhhHZRtzTL9Lq0r5Ng1FDfbl5vKHADpluPPR3iy8bHyb7p8ySmdF9zWWtJ+xi26Tq55od6tCvL11uPd2yLDx5/QG6/MLspbvMEJQdvxy8BWzinfUooEFrZlyVYJfjJfcpErLTDiQFE1aPE8g+7JU6pqDfOagc2fKikxp5UaS9ZYNRD/LWFtlh5a+ZinBpPqiWFW0+VzAWW4YK7y8nFpEFYTvaC9aILxwjZcBbQLrsNtPlgjrSXKlV2d3f0mjaM488xpG76qxX/9EUxXbetEdVQ7kFfAbcZU9hQI+nocuN3d65m3KA0JRESmK6KmoFfkwe1Pz25Pl1lob3cJ1TzTZr5t0vmUiJZnFIvZG0Xft8PrTu3zhilQBk/ueTh5GqQp7u01qECBDpf452WPjgYiPTn6RXcXtyhYd1Y6M8fLkt+qNxxwpyTICHMrnedUpR0XdPaa2JMhcaVBA1q3qZGrbHdBcELoxEosSusW8AUU8ZS5j+Q9FdbkDX0gBHBKjcjEMihU28qgaPzX/UnEkY2Mr0if42zrPwHXab19ydU= X-MS-TrafficTypeDiagnostic: AM6PR03MB5172: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M4jMG23+9bZznBP2AxVErYc7GyRSTBNzrRaTEwN0xNvNy4Iksa20b2gBSXlfU2WHtoNgbjiVyNyw9tVfMRgX9yDTwJxta5u92M4UIcXgD3O+50uDHPAV5Oij9SLbVWVU6V9mtgxRws4fswpTT7PIPOhdFSTQSE3WDPsPtMc1xINUyER6Ri0BhOdVlD3axgOvghd2IYFb/cv+3n9677Y39FS11aicYwrqRuG8ZmIOyjhTDOCB0zZCuawwNPW3KtBq/is/fzOZ+uz2wzJ8ERKKkrebwC7p5UCySu0KFAqDUvoydbXUDzm2PWH7kYRjcO+d8E/jUkPU1sRsYLCxjpyalPjU02lgQnjK03FbUXJK4w6Tz3OAd6Js+3019+fyK8u4b9/uG8Yuj9VVUrwXM7R1cTgaN+BykWKrW3Ww9BimLaZDDfaoSpSgVaucnvHHC3Hn X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: M6SPpqrtLV+yoRYHiZQCMIvhcpOGaC7YW5b47nUaVh/TcFolR0temk/YeAtUsN4dBo+fCHn+aFUnwugqKq3VXhYbY3rgeXWOwAtBfusdy0jPftJuxzp1bIJALPieAZCv6kK+9UhufzkooU4Z5PplKw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c97faf2b-73d7-48b0-10f4-08d97ea70aa5 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2021 15:30:15.4835 (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: AM6PR03MB5172 Subject: [FFmpeg-devel] [PATCH 24/27] avformat/aviobuf: Extend ffio_fill to 64bits 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: 9Jwvy1a25Amg Signed-off-by: Andreas Rheinhardt --- libavformat/avio_internal.h | 2 +- libavformat/aviobuf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index 8b9e048f73..11060e9ff9 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -100,7 +100,7 @@ void ffio_init_context(FFIOContext *s, */ int ffio_read_indirect(AVIOContext *s, unsigned char *buf, int size, const unsigned char **data); -void ffio_fill(AVIOContext *s, int b, int count); +void ffio_fill(AVIOContext *s, int b, int64_t count); static av_always_inline void ffio_wfourcc(AVIOContext *pb, const uint8_t *s) { diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 28db2c7dbd..d79e41ca77 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -201,7 +201,7 @@ void avio_w8(AVIOContext *s, int b) flush_buffer(s); } -void ffio_fill(AVIOContext *s, int b, int count) +void ffio_fill(AVIOContext *s, int b, int64_t count) { while (count > 0) { int len = FFMIN(s->buf_end - s->buf_ptr, count);