From patchwork Wed Aug 4 16:21:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29244 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp3518759ioh; Wed, 4 Aug 2021 09:22:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz3fL8EIqAyoGr6Z0dBz3trtuyIKZT6scD6NEyYNWvtmsB98nBs0F4RrleZYsyLmYCTsIcA X-Received: by 2002:a05:6402:1a35:: with SMTP id be21mr659910edb.332.1628094151554; Wed, 04 Aug 2021 09:22:31 -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 l24si2693434ejz.543.2021.08.04.09.22.30; Wed, 04 Aug 2021 09:22:31 -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=B5pTLXRB; 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 82A6F68A101; Wed, 4 Aug 2021 19:22:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064090.outbound.protection.outlook.com [40.92.64.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CBAF68834D for ; Wed, 4 Aug 2021 19:22:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TurCBzVUxSM4LJBz2R/5LbYjHTTkyrMO8mqIWI7ueRbs7eo9pPBMJDKfatRSLbzIVOKX1WqjchkiqFqLQQu4o7kD8KVek2AAfuIhzwOBG7kde1HEUO3qshz4ueDBrW8wRKGR9AaXgztXojo+sfEm1i1AalPNN0YGgyIiA+cZwINznnLN96muN/CXcFl0xUMDKPb8Ndg5Xo609wuObEDdqhpyZwezrtWuf6L0YujOmHFaVktbYEPY+YEFQI1AO2JeahV9iRtzliE1Oc9GzrMX47jgPhrXSgM+OKBLFXR9rku4wLsHa5Nbsgn4651WzHq6qOH8MI7kUAA78L0y+IHUVw== 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=OBIrIW+TzpKCNkfFcJl25iqkfDO3OYuOxBnUxkB6TmQ=; b=Uje6jX8IJZAzPK72qkysD034258R5AMpboeODSytj4oYJ4M/n33ncBYah1J6om9q7tjxflGHj2o31WvyqWgRkm0tpZVjkVLAFlWyo4OZtiyK9wMRRijBJ048q7fmtUOiX/eE1jQltoJ4Qk+CoMb652uSlIjWyiQcJ+NOITksDGaz8nBb8AvqC8eL+88x3jg4bmxWun8O5Z3kJTy4vvTisdy65r2hQLrGmua8eu/3ll542J6CVMGy4a0yM7zA+ym6e7Rjlbb/ADF6V/kTFSXCX3Z0lopGGx+dB2azddxysI0HPkE5mvKfuFU4CHx3vBL4eSCUW/BRpPC1ejI8olNRUQ== 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=OBIrIW+TzpKCNkfFcJl25iqkfDO3OYuOxBnUxkB6TmQ=; b=B5pTLXRBGRfpNvcNQemUP9WsHI8E0FvQI0GyllmiQZJCcwBHEzsiF3qmbv/G3pYDzLCDj50qCZkNfW09ZVAfVr2Uyb3Loy/+egp+KLsof91X57IfJwGiWQ4V0SGgQHeZQF65Jrab60GI5fXXJQnlTTClJpU9nZvxfzCwAPhnE8U1qGPclg66i30fnUmWs0nS6AUK4Lh20Ox67LNu6QGpruQ38OTm5hcW2niBsbPkrvdXa78jpmgRZ8h2KXGyO2CvoaCgmAyOwOXQEASM1mSTHg7l39+LU8CryJ+7WHSrrcsRyff3s+IYo0dhjLoOxsZ4nERw7EkTk8ADmfMEbjS2Lw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3685.eurprd03.prod.outlook.com (2603:10a6:209:33::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.25; Wed, 4 Aug 2021 16:22:21 +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.026; Wed, 4 Aug 2021 16:22:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Aug 2021 18:21:41 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210804162143.1793548-1-andreas.rheinhardt@outlook.com> References: <20210804162143.1793548-1-andreas.rheinhardt@outlook.com> X-TMN: [Z1WjcRHLK3Pf9dEKbQ+gkaNL+sxfu1Rm] X-ClientProxiedBy: AM4PR0902CA0018.eurprd09.prod.outlook.com (2603:10a6:200:9b::28) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210804162143.1793548-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by AM4PR0902CA0018.eurprd09.prod.outlook.com (2603:10a6:200:9b::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.16 via Frontend Transport; Wed, 4 Aug 2021 16:22:20 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 601638a3-8612-48cb-5fd1-08d9576408e5 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNW/g7RXT9bbJyQEkjcBzwXk5Xv1T0guo6YIU0fIKACgrJ9BZg0HlUbz3YkakXEgKuurFFwYFRNVhucpRoNGvKWI5KE8zq73pbDTDlnz1EnZ+q8HmbR4jIIeS8gINMeTXM+X4+ZDC4cqWlykRe2jgpN9YHkW4FgsmTErIBbaaCZez444UeeseveQVkLkS2tW+Kb928GC2E9IL1k0okntj9Fn9l3d58aUymXQty1rA0vsxjXrHuWZKIkYDMigbhHJg4NxZX94s4X2AaXUKldubiRpL+q/tpa2PSd+6/mXCo81jV+tENkPGPMzbXeYzX1DSgatHIrlBP+JF9vVRTtSRtb87VYJNXjfnTNWJeN8kQp73edVoUJkORMRmavLwglKuwA5Yuic5xgyLPQCw/1hxtiRhXw6nBYu9DlEWrpHbZT4rjGgruD988pI3EjsOZIBFJ09mJVDEyksMR9UAb3hKUAkyVTxwIlg5DCBNUVzpWSQ+bHuQ7ujbOmLGmOCFPyOk9+YVBAUEmZ2kTCWlbeaMeT9F0kYy9ODjRZ3MQWE/p/vLK2xxgFjQdZFl2i4G9GW6+i4CiStrPGftT9Roc3lU3gL9fjJRVSYGZXxhv7JXMUmO70WjUCuSXZSECehJpwn2ZHhKcxqfFW1b9fBJyWJp3aVVz19pRaUAsCigl/xJWQui2UpHfMQcTatgRH0NeWnJPkv5z+gHl3Su7mIwvhFZU2Ov0gR/MQENA4= X-MS-TrafficTypeDiagnostic: AM6PR03MB3685: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cErt95dfLsa7ppkgFoB1VUXUfMokTo9+4o8EOn9tExqSkOXrH1Lr1ZENLIzat7Nhu5lVALmkQqxeeP7p3kwnDDEUMHwd1lZNXbSBBzXKbPwtwP7v3igXNXdAAAGFpXryvzmxRpTBLxsWdv+1lelEz0oXUzavo1okJ/7pmdu0e4f+Z4PClI4V9Tn96eaxrPao8pN9JqxUj8EB3APDcRCFoh7HxpCVAY3FPRSq7xC5rFCwSUnQjetnmxBdd86RQEIehrvlXJYDMY3dA0GHpiJPOXCEkDX1AyGlsOQQqKPf24M76owjlCPqh05emrpQqjTHY91u+hwj2Y+YvDLrYaJp+8yJ2fCV+jlY1cmVv8h8y+XPQfTbEU6nFzIo6tXZJCU2XCOsG8q+l+Vn8CLaKOaPpPncT2RvFbYQK0qhsJCT6ZrGwF4h0tDGNINxpaPOIPLk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: De/TPnAr2CDuyjbt2eKfBKrb5wWopAxHUQ/+AoJ7cNaontcM54OoVaLrVC/x/SGek7fxIf48JgCc5fmOOYKz21bK7XGxM4X4cMPwlUT+gVuqVApUMAI+6dGiZaFMZ8Ep3SgP/yAIrGdHG3dApNQLCg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 601638a3-8612-48cb-5fd1-08d9576408e5 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2021 16:22:20.9083 (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: AM6PR03MB3685 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/aviobuf: Use ffio_fill for padding 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: OtEUDRothJgq Signed-off-by: Andreas Rheinhardt --- libavformat/aviobuf.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index e92b3dc610..860fbcae5b 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -26,7 +26,7 @@ #include "libavutil/log.h" #include "libavutil/opt.h" #include "libavutil/avassert.h" -#include "avformat.h" +#include "libavcodec/defs.h" #include "avio.h" #include "avio_internal.h" #include "internal.h" @@ -1407,7 +1407,6 @@ int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer) { DynBuffer *d; int size; - static const char padbuf[AV_INPUT_BUFFER_PADDING_SIZE] = {0}; int padding = 0; if (!s) { @@ -1417,7 +1416,7 @@ int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer) /* don't attempt to pad fixed-size packet buffers */ if (!s->max_packet_size) { - avio_write(s, padbuf, sizeof(padbuf)); + ffio_fill(s, 0, AV_INPUT_BUFFER_PADDING_SIZE); padding = AV_INPUT_BUFFER_PADDING_SIZE; }