From patchwork Tue Aug 10 17:58:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29400 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp667745iod; Tue, 10 Aug 2021 10:58:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbHJl25myjttGuVAZCKIbBPf5i3/mZi3NkbZ/FWzCBjKUqyb0P9iQSvJl/yjZ3pL9j6xQn X-Received: by 2002:a17:906:3c45:: with SMTP id i5mr15053122ejg.336.1628618307169; Tue, 10 Aug 2021 10:58:27 -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 n2si22485221edi.195.2021.08.10.10.58.26; Tue, 10 Aug 2021 10:58:27 -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=j9m+VcwL; 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 40AFE68A1C3; Tue, 10 Aug 2021 20:58:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072051.outbound.protection.outlook.com [40.92.72.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0246D68085C for ; Tue, 10 Aug 2021 20:58:17 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hMoySrFrpxB8tbkhQ3IDK8+MBrQtFjv1ytecq6WPqGm4ZXNzP35l9txYc9Vp1PgByq6NRM/bKh3ZNM/yDmsjE9V9bQ5qsGbKQS9g5YnYNf8odh2Nof7Ax6rW5TqYvlX9WG4rgI6jkUeB04OASC7j4uBPRdrKWbKhWTl4FEyggmtc88B1CAPyN76un5W4Moc/hIcwu+3wKZr1+OYl3Ag0uGjJ+ZBWl+qgO67C07bT0fkISuMN951SzdLMxp4VvGMn8V1XT8Xi+Wflj2b657aYLioLdvcnh8mmOSumaq28rjK4HZcpGonif5pHWGuExoF/DKNHg6OiA2IGBN08tqYAMQ== 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=fCOS0B3PTDNRt1zCrPJkp1VTddJnKNHrfD4KneT6Dbo=; b=b4oxc2ZdSl5a8p2TBbtWS7qQfUCTurlRRR55URbKT+N+6/ebxbDB+CQFQQGXv5NjFg3I8SZMFAMw/PUed2n/UloC+nYZK8FxDlfwbPo1XXag+PViBEdqxuqnnnDt8Wo/emAWfuN/QtDnaHB5Cgk5Qvg2JMaRbIkwwne/7D7BR7gF7HHCGd1Xq6j+qDPaPLrQMwB6zb/j5MOVJ1OT9AZZW7rr/ALZFt+ld8EtqXhjKHfFflJKsRQ2Mdt9nRKwiF49xicPdNBvfSHdlKAv5CLNooCRFfJ5sj9Nhs8Vpc8g5AsDvj5gtehwX3Qdxmo1a2BV0MIGpsNeBAK4j59ue1tSiA== 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=fCOS0B3PTDNRt1zCrPJkp1VTddJnKNHrfD4KneT6Dbo=; b=j9m+VcwLK6rcNNgJ5P7flKLPZFgKnjLBQ9U5bFuAJMrJZqXwElUFv4sbQlRAIKxIDtwfAMNWkuhrcr09IizKavv8qnibij2rfTxohrSTGyuMgAKoe1AD9AQ+eDyFcMQ60cBunJ6UqsBM2qrKLlYTHEv7nHEntcErnvXCk0/UihTH+lk+ByeLHJGSWYGBNsQEoJY5z06fSuv0SLZWuzCBQOPckUbyI32SzdRyCIWjDbWB/f4XVJDOxVjN+B318bOp1CYOhCYnNsxvZoPbWuV0fn1R8bdERvFYPA3bzbDTl7odbdGyQyk/g25s0g7P8XqEx1K4Xi8ECDLQtSggATF9Wg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7349.eurprd03.prod.outlook.com (2603:10a6:20b:2b6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15; Tue, 10 Aug 2021 17:58:16 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ded:bace:bc7:e91d%3]) with mapi id 15.20.4394.023; Tue, 10 Aug 2021 17:58:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Aug 2021 19:58:07 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [F2mOYmMyXUXH0yUxkCzRNjAHBK8ExjNV] X-ClientProxiedBy: FR0P281CA0065.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210810175808.564299-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.95.102) by FR0P281CA0065.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.4 via Frontend Transport; Tue, 10 Aug 2021 17:58:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b05d373e-d5c2-4da9-544d-08d95c286e14 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVNZZwRrMzTbU3V8ckKb7Uv4a1T/tkWThsvJ+CyVM4j99zVnz1dg2ZF02LajGk+b6ssIB4yorB/MsoHBmDNxZaGcmYMzJqeNooXDT4RHOo3fAc0SMjc2FD0uBZkHSLCIkZ93SwDY+HR5g+mHyxmr/aZuelUmWjgK4bWC8vbOvu8Kz5j+C0iX4aNcGfZIvX2uan8m7MELmMHKGoScDgm1Eq2g1W8oKcGurmO0UhdTHozPrbfWH00BfMam9NmwJlQ5Uk5T+QTMQEF9kUIdc8VGBK2ky4EfwxdoZ2Zb8cX1aZuzQ3GbuU2CcSxMFrZ2agB/nZg1GelvRSdHTe6nkr2HwyXRi4hnmv4W5qhJI9yFMrBukqo99porlEKp63+zuJrNGjhg+RevkexKq/o1qZzyu4/+ByiZKVq06SbOjNF10QXAKHKerQ52d4guVsXafeMaTVdE0SG1E8rH6LSZ8nvITAPqODDjBpzi04+t+I2dBjYU3MxX8SV1+2f6PaZ3Fy0WKSU47NqmLCMwNtZ+CcYEJ1m5rEDruVoruCqVRcqxi60zgFWeWwpo8ywPUDKDAxELvcv0BbaUSxOy3VYiEMvefxr2kajh1ErGL1g137Xpil2498am+vGjsdkUIW4rlqEd4PLNwTsMZkn/neO9dizpoae9U/HAThgTvshZfZH4ca5BYeJ1HgtHBq1ugbkR9KMrau6OJFenzHeAia5j06UDbakvnOVY77HX8g= X-MS-TrafficTypeDiagnostic: AS8PR03MB7349: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LFjvK3QuavoNCeoP3lYmcWMTO4a/aOrRM5hxiL43i8AXrNx5X7BhfIpWSLT2Gr7Hd8DA/l3wdIG2MBwukgitovO6OB7I8DuPgqFZj3mgXvOsEAAoV/vShgndELBQNcHr9GW/noq52P40nhJ5l5ZxScIdJSxZ0gPBg5mIlZMGRf06boni5ROyrmJ/8yfV9K1MVj3WQu3BsPcqkIZ2K6DRREAE9Aiv0MkGO5DGen9seINBopAnhpkYzS388J9LWbAXzp+AW5uCHeFqgnODhG3d9svtecvskU0ywz4SUDXVaXirkbetljW0f5CA+MHGGa6+O30Z0aqYKWjUrA839mjYb3XZXEhsGsit+ORfkWk16IF9fwVi+unGeE2IFRuMrCXgrmU6tTLSDQ2eRVaqWIslTun55R26SsRfZFzGD6YcQLSft9WYlT0sO0wLccqxXw6Q X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sNKUtOTDjIzWh9tcyIqcU9lfLW53a4Ns2qvvP14TYndx9Aah9wFrZ6c6zxEf9soDdaXQgaV+HVSq/+IOzOa768MZta+pRRh64YQ8221RUMDG9I2LtozmytxDBUCFAz4abdOtk7YQufJximo7JcSC0Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b05d373e-d5c2-4da9-544d-08d95c286e14 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2021 17:58:16.6910 (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: AS8PR03MB7349 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/oggdec: Use av_realloc_array() 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: 1a+LJy62NILh Signed-off-by: Andreas Rheinhardt --- This also removes the last user of av_size_mult from libavformat (indeed, from anything outside of mem.c), so this removes one entry from the list of dynamic symbols (if using a shared build). libavformat/oggdec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index bb289e0756..5afbae2147 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -251,7 +251,6 @@ static int ogg_new_stream(AVFormatContext *s, uint32_t serial) int idx = ogg->nstreams; AVStream *st; struct ogg_stream *os; - size_t size; if (ogg->state) { av_log(s, AV_LOG_ERROR, "New streams are not supposed to be added " @@ -260,8 +259,8 @@ static int ogg_new_stream(AVFormatContext *s, uint32_t serial) } /* Allocate and init a new Ogg Stream */ - if (av_size_mult(ogg->nstreams + 1, sizeof(*ogg->streams), &size) < 0 || - !(os = av_realloc(ogg->streams, size))) + if (!(os = av_realloc_array(ogg->streams, ogg->nstreams + 1, + sizeof(*ogg->streams)))) return AVERROR(ENOMEM); ogg->streams = os; os = ogg->streams + idx;