From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 906D342679 for ; Wed, 5 Jan 2022 21:56:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3B6D268AD93; Wed, 5 Jan 2022 23:56:26 +0200 (EET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075100.outbound.protection.outlook.com [40.92.75.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 23D3B681871 for ; Wed, 5 Jan 2022 23:56:19 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WKRZCMXC83JKgg9pzLWbNN5m5Jgfh5pMxoGGmscY64XWbB/K9LitudYdfW5Vf3kXbJXIBsH6jENfEjUx5DEeCPGRccdJFhOsB5cjQ/7A4gCQiRVCocJxwxYYoNdWilpnzwnyDRtrwXkc87W7aQ5kiD3ZlgmOwbP+j3u80Om4y3f7q4DlBn/kkWWKMlBEOVIwLM+sQjflyC04pHkIZO5Ul3V+RzTGT+Wc5PGR2G0E9WYYx4hGl6JXIZ2EAyY3PK9aO09x0smOy3oCVkzYzC9Rpo3GG4/IL2GRg0xFTYlBscZjuWhmeuD0ZXnoTZVZlPTfZOfu/NK0iFr8N8yoZvb+9Q== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lSPE4LwgXCSEJyvOdl0KmQ+l7ZNiM9dY8KpWOxfDHUA=; b=HAxW7q0P0MpM8adZLfCkANXXa0mqtOFUiOcsQhZf6a/CcrJgRZrxUq1UfiAQHFUzD6Acgujjd4SqMSGUpFjS4tEZPUDnhzFBlORbUPIdkC5MFP5Jd3Th1kAM88Hud11iwAOVjgx1Rx8tIEQGnlq4Dp7fh5aa3a3iTQoFMQdjFfOyaERWEVOblCYC1XyEWjbsSYXnYf+Tfn6wrbsSrWYZ7V288GCwFpjytk1LMqzNrrACgGmYbxoyBtaS4UFwLF+IU3v06qIfvEdZp3OPUCD6yDGJsXkQfrcyHlVaDz0otzJ1ErjXdA0GPNhCEGKKD+FNG2SHPVAlmzlYQchyHOazGA== 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=lSPE4LwgXCSEJyvOdl0KmQ+l7ZNiM9dY8KpWOxfDHUA=; b=uGuy/mwQnKg+7CcurTgzmeS50z0YpmloXfDHsCnRvANH4k8dp5ZiYkjBKLqM65SVR6H7FW1srXbT2jDnanpXLXLUN4QLq4Wm1mu1A2Hu6ZIMIoFGlkmxARFiXAHl8zBj+a20khxrOsPPQANp+j6yzEicClI/xmfaVOEfIBgMc8oIyLtEfmSNqm1g2nOw3ECXHnRYfHrnJPn5CSSQBQZ78zdMTBsHN39ge8VjDf1m2XQl/ykm1EupW0LwBBjvZnatSrnUyi7dyICSZTSZ6/o5NyUO92FiDWgBV8z519TlewUNW74MHrYHgUCbazvKRXw8Xj7WcBn7281kZNc2CcSVMA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6450.eurprd03.prod.outlook.com (2603:10a6:20b:1b2::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Wed, 5 Jan 2022 21:56:17 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Wed, 5 Jan 2022 21:56:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jan 2022 22:56:02 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [oB7szFi9woCIeNDh14alLrPyqeon+5Er] X-ClientProxiedBy: AM0PR02CA0183.eurprd02.prod.outlook.com (2603:10a6:20b:28e::20) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220105215610.813119-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a3dbeea7-5b65-4721-b0df-08d9d0963321 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1J5im7yoFdrO8UM0gN6XZ//KZNulHI3fZ6ZyCbtQg/OVk28skIDO1CLAWH1e5KpgDdzx0oMoG5Cuh7p9QgkFhfkMBwpgXCqBUsPm5tUe4elMwDSiUpVTvIBLsON+YSNz0WN8JxfLXR4Tt52GAemyuFBmRbEn3YgYtiVgIsCimLWwlypAHMRKfJwydyyroo8sGkZ7O66B/r4VdtuFInIm6XI4oPqZvS6fPX3Qw3GyY1gQHT6+wURrAYG2tzOLzXXnQiWRzI9n0HD7HX5UVcPPf4lXdQAw9aMByMJ5pdi83QnFbLfnV3y7qmmy9nn52UDrKghERkOdvrQFC/uhrLOpbAcdCTzpfHCCocsb7DbIi8kSUz3TC/7aM/5YvG8CuDXyWQwE2mwuNxWarHnrQil1LrMykEqs1BwwU5pdfzIxs8MynnvskrRBSDl36GBFn0AstfSetIu71jKk37jZhtURxPOBLO3dGOxNF2ewQ8n+X0UzRokzZ3smUEByvHqg9+cfU1QKV3ewg2eTZlHzNeptMVIkQm3PIkkzOnj6q7KJIhj/JaM9SBw96eVxkldUzPD0xBnV/+9apf9f/aObae42C4+KZUMQJ5NUJxiKa8M8vktJgtmOQDA85a6+y2VOIWDDfWQJfKsjbYZMBOdiYw4zSj4okZZuLCdvZzh1BlerTTTcQKxOKUdMN7RpNH4XCsdicwTKvXJT9rrvdg+ENHRM3GgP5zOCRgY8NUNtqr3m1FImw= X-MS-TrafficTypeDiagnostic: AM7PR03MB6450:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0uw7WXCrR2LGjvNoTKIbb0lApeREltnuZSi+u1agLzlBquxQpfCdNpxe9TzMKQJS9BRK3akPIOjQo+6I58Sa2BRLzVqEzIXtki8eRHpa+bbi24NVo0xVoaviX1ZDLNMeoDpZEJwWJEKeyJq+GpIOXkclaQaqzdYYLMNE7GdN5L8GcT63sU/33xPK65ryxS760Q5/5Fp3NC+zrbu2pJKNQ1specua67Zly/u8tkvRsjNKGFkPCzZy1qPzYMC49dUhc7qcdbLXM1bx+LXPCuA3w/rDao7ZJEYL1bL6aUGEO+hufAxkFPMedPw0ortIy97X1dXHT3iy0lDIhgAsQpNKJ3tds4nKnMsLYxI9NF4YQUFi6BIHCQAaAJB/0k+R+p1aeGODWg5a0/Y4iwBJIPwQyVjvI4hEbuEFE+HcmlYGjmHCGXWKHuN2s+dC3OSP84yzRJcdTkmDctxGvLKCI0szDo8pZCHfevso3tuP2AbzyHvv0HCNSYTg8l8rFr3NNPlT149jaApULNEnzXcScmy3NHpTo9vlJkfJ3KC64Au+xAmbe7BElISpCxbrXfJqZzETatSpCuTNFWY31S0EM2PjZA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2DdTGThNILtTicePbzrUPg00h2I2/ugztKJY6OsRKsefTerZiedKFIiHNEsZ?= =?us-ascii?Q?gIfdO51U1tjyuqrSjQAZUZrSNjFeESfZw3IRhL9h0TQJkTtwUhuWAbBhkDRV?= =?us-ascii?Q?+Mvqpp7zxuiyZH7+h6A3i/X9mvk4N0uOS2HqaVa35ZJiK34K5rkgc9c/AqUf?= =?us-ascii?Q?O01286vZYHCSZib6BeQSQVEGlbnTSlfb/vgcFkDdrJfXsy9N3OcS4G4yg8vN?= =?us-ascii?Q?Effiq6ha6UVBqUitohYJNx5qq5DhwWRA0pZUN83ujkk40vP1wba20Cn9VJl+?= =?us-ascii?Q?zvb+0XX4vbcVnJv8+pVb+Nos3auczHVjlK5dxDUkMZGiJTs/RYN9GRGFEbUN?= =?us-ascii?Q?lKAxtWFfw0gByeXGv57Fx21WyH0FiLuTdEiu4ZfBEzLj6AEnHmBrFqzEYCoL?= =?us-ascii?Q?MN5Qznpsei9r64aeqdS6F5bR9+PoU28sZrDRUXmaQz50xFT/tE6ffee3DiE0?= =?us-ascii?Q?yDkeEXauvh7Zg3MhXB2EqLSO7LKPLtaLMIhVI8Pf4dISNDoAA7C/SlDXRncZ?= =?us-ascii?Q?K4iTK+1pPR0HrAGZ2DgW8wQyn7nlr5Yv42SIHGCQa9QJttt9xSbWeFgibV9g?= =?us-ascii?Q?c9ILP7byUCnlE+I3U6Zod2W19PtrI76WMORNevNtBTOJXDIsV5y6AZ2nnRGM?= =?us-ascii?Q?RTyR7+Xhl4A5s0VXv7v0R2456EDLVvK0WqMyBc2g2TjYqcHoLrmI8m5hRnmh?= =?us-ascii?Q?Y8GZwbboJrHxeBTnRwAtZmm7MdSllDuoJR257idPZurpiETeUxNCr5qRd0+h?= =?us-ascii?Q?D6eR6MTisSaf3ByiMZUHO9BkIe4Pl5P5XlP0V9kMIQ1fM2JKvB/quhRiNF+J?= =?us-ascii?Q?iAQW8JyJJSkBpFNNbEt/f7V/gvSKwOVyjficv+92NYN+VzMHMCpCebuAWM3k?= =?us-ascii?Q?FVvFpN5xyQ6csc3/gV5b8K6gAmyYNlf9Tqv08TK5NDfJ6dwIoezujCizz4u/?= =?us-ascii?Q?BD7LoA+YggIuiyOosPGfWg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a3dbeea7-5b65-4721-b0df-08d9d0963321 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2022 21:56:17.3341 (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: AM7PR03MB6450 Subject: [FFmpeg-devel] [PATCH 02/10] avcodec/mpegvideo: Don't unnecessarily allocate buffers 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 1c2b28f450..af433153f2 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -371,17 +371,17 @@ static int init_duplicate_context(MpegEncContext *s) s->pblocks[i] = &s->block[i]; } - if (!(s->block32 = av_mallocz(sizeof(*s->block32))) || - !(s->dpcm_macroblock = av_mallocz(sizeof(*s->dpcm_macroblock)))) - return AVERROR(ENOMEM); - s->dpcm_direction = 0; - if (s->avctx->codec_tag == AV_RL32("VCR2")) { // exchange uv FFSWAP(void *, s->pblocks[4], s->pblocks[5]); } if (s->out_format == FMT_H263) { + if (!(s->block32 = av_mallocz(sizeof(*s->block32))) || + !(s->dpcm_macroblock = av_mallocz(sizeof(*s->dpcm_macroblock)))) + return AVERROR(ENOMEM); + s->dpcm_direction = 0; + /* ac values */ if (!FF_ALLOCZ_TYPED_ARRAY(s->ac_val_base, yc_size)) return AVERROR(ENOMEM); -- 2.32.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".