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 606C34A7D8 for ; Sat, 11 May 2024 20:54:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2E4D268D642; Sat, 11 May 2024 23:52:56 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2104.outbound.protection.outlook.com [40.92.91.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A02468D467 for ; Sat, 11 May 2024 23:52:53 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cYL27gyT7gYV7a3eqODH6Y1iYFlJ7R4BxZJvvxq5b3vk6heU6GlVU41jFaPvdf00fu4lKW1AX2X0FT/LRHGjigZuz5Mm1uyKQmWVczQ3bQ5OiUjn/HpHegL2lHIEmru1t7VrkY5VuOTGGKV2+UUt6CLr1/REyCuD0h1Nziql6Q8h6RXno35ZjtWHuFcrN9KIvcImbQcfXNickFjBxBfd1kbpVNs1e5TVmxitzth3Ts3j5HoALNk1C5Vr1kpvlhOs6aL/IH1IFrPTCM6t2lOBwb/Cvb5D6s3yUWCSEeaJ15QjT/UzhBBrfo+44/qF8jBHNdpT5qpPw4bkclBFORiKyg== 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=2vLttLR1fxgjycn4KuEmsk/mDwuAnNuq5i+O4Ioj30g=; b=axYj7StfNDkAmS35YMYGAF1I8AUHP0weuCp/PRMgesyO5g4bFGUg0DHZ7s+Fzqqand5QCUhv6r31NFnIOzFOPh0QP8jSdwkGoLh61l+HLurZiZV2FegS5q7OzogUvZ09gCih5Vt2r6UJHlfC/zVyl0JQUz1Aq6AFZf+w5rKG/7GZ3Evzuax8bgmu6XT7vSRsOEck7Uy5M4VVlV0G7aUr8AU++35Ef2zc2Kegs+IK/BMRGmg/bDAt9yBLlvvYgFzjW9lq1Mft3GJMAfnc8xrubnAEbpPrNLduxrDxxOZaauaHNbg/fn0qkpJAl0BUDxr2b1KI59qrBjvpYeSZB7diTw== 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=2vLttLR1fxgjycn4KuEmsk/mDwuAnNuq5i+O4Ioj30g=; b=uHSF1+0CxZbqH1/JE5j+s3v1pPBKy+mV8dnt/B/+4bSvd0Qm8CKE9vr5WZHCcDhdU4SrnHVWJa/sWV4T99nf5C8mfThVa4MjPwCkHmNGYkCjZSWD7n5VGq/81hL2U3G42KwoBCpJ/Pm4mUHn7a/fLYHLp3bmFGWMw5chvgbWaURxNElacYsWjCDNNVFQCdqZrT6cJHQQjznyBU37cU8nuljrRoSUMqqVnNbTonkzma0FVMqnw/q/SOFJj/ogX7fb187V5Z2saIANUf3dOW88ZDiAcCJ3r5MXaYA+58jaxgo3j9eyTIrQbZKkbexxsv8Aabu2tGyWjlGLnecYA63mgw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0370.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.55; Sat, 11 May 2024 20:52:49 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.052; Sat, 11 May 2024 20:52:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:50:41 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [luchA69sRGRJB6cyYqF+9EQ/suzkOgKT3wgTgGFsQdY=] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240511205135.2411886-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0370:EE_ X-MS-Office365-Filtering-Correlation-Id: b5efa182-2754-47fe-7b91-08dc71fc5158 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: aC0GJNxzKdk76wMfFd32GekHIJp7wcHXqDSw6ZFz+Lu0T8bK3MVN/UkcCMMzC2awhUURIVVTomMMI4KCq6KYHuLBS8ydCrGQElEzpft49FA72ZCpWLneDdox4FeOkITG0PnvXiaBRRC7D/F6UZyFU/8RFKVUb8wpDVqsJH2u+9ROfmIdYJAOAI8StoADC+kDNMR0sL0d6FnuZuEyt+gkjQMuegyrhkcwZowiTc3zl0GKUstP/tpc8KLVlg0i9BWrmZpWAxBPohkk+GLPPNFFCRge32Vd5xrrm23l2LjCUhRQANayaXQNW4jqWc/Cupt7S+rUxRXdztEM5T66Wgd2tWTHxrbS3FEnjJtQNvKX5WsUqNeGzNE2ntXhNYnh430Uywl+K5fAG9gc5hHZl0bfNd2R/eSvWlEJWqrB2eyJZkhqKQkDWXJDKAVQn45Aw2SV+tdLq+fIAQb8oK+giRn2CPndinI88hdv5X3EcZpieGaGCtaSjEBe/CoKyZ4L8Csoxcwzpe3NFCSe7Pt6vmy8vFUHhLOCf6q6kaZVGRmHaOzmkxsu+jfIBhbxHWkOuv2abZPKaQr2iXrJHziZIwp7hRE/KJdP3/89fvd5wOqeb0EqrPNz7Yt9V8bRmnBrfwfz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?75buE0XuEA5r1t6MNxBhnCcBJdIdcQ8q5uKPkSUBpT/FGetvjwrFVBsySrXY?= =?us-ascii?Q?jyZ0qde3fNgz8O8YRgl7H2mhlY2NAI2I6gFBWtW7E7xwM7L3SfhoWzY0U5Z2?= =?us-ascii?Q?NudLDfLkGehX/GdAW+Tq9NQ+T/0QWVO+Ximca8sTQAtbDKxT5VxVLRxGxet/?= =?us-ascii?Q?ISTAch0vqM5H+qPZ6r3lUyVPtc+46Su10rE3goEJ5t5FQht5M3asp4xhxaNl?= =?us-ascii?Q?Xv9W3aqarYOPGQ3rBk/C8ONWBe+aeUZ1BYP+lcWu8AnTsWeWyb7E/YqiURLZ?= =?us-ascii?Q?N41KwoV3NOhQXXmlLsoCRLXJ7olSYnZ+5IGd6fVzJowNhkLo0aGGIkMoLH3H?= =?us-ascii?Q?9KZk/jqL3g3rvD94VOQA830rMNrPhJLnDNTU1xtP9ocVpb4X/dQnzSxCmdKi?= =?us-ascii?Q?UsHn1fJTM3jspPowy4kvFnWnxVUfa54qyDZGtx2TMShZOY9AOZmsp+y74Vq8?= =?us-ascii?Q?rLf1ulZ1VjtKIO78AHQ0b4VaFCftCPJQzO58YGWETqCCW5jHKztG2XXsffy4?= =?us-ascii?Q?I0mUBVSNuhzA5aKF4QlBCEdsEFIjUft8UZ7NKdxSzbb5BAmArHFBNS15CRYJ?= =?us-ascii?Q?/Tq3h44KynKLp4bcFSufzvpqeQTOGmu7luyTlYqnv87WlKUpt/Wve0HpLLtR?= =?us-ascii?Q?Ru7/dsD0Fqm6oN4yZX0nGjOlGXzlcsPcN+X8WG9o7kiG1hUbqEvYzHnWlbI1?= =?us-ascii?Q?1D08GzN///4rREawRynsD8NOal0ZECHpDotBzy704D7Bhf57fNYw04k5PSBM?= =?us-ascii?Q?SQxBjvXbqdKt89jKJiHxpu2XwJLq1W8+do+kXyyOndbDkI+Ve6MFaPr3+97l?= =?us-ascii?Q?FndvUb7M8+DCTPg5JYtxPvFGYK2AiZ+ejOsSAWcROi6uIJua+29qkX4gCgfT?= =?us-ascii?Q?4TX3R4R1TIMDg2kosc3EOlbXfcAAOHTZWgfd6XwK7GsvpA7Re3QwtKmEk2OZ?= =?us-ascii?Q?3KZ6sVbjhoDqPdfDg1DtmkyswcwkyOVSpCiJypPMpWZOcscVrHrZ27kYhHwE?= =?us-ascii?Q?w8qtv0t7dXdOPrhhC0dlSaCxSK/jEyxO/YfB3ZFkd9EhUXdYMWxjPh3XRcby?= =?us-ascii?Q?kqSVJLRSLYC0Ks4H6pAG60GV1vC47x7OC49z78bw6wUHHchsux0jFftY7iNN?= =?us-ascii?Q?dmnRWJVo49wKLVEm34PwMZe7DhosU1rkhsjiYq62IWK9KOGZ2ng4TDPj5e5n?= =?us-ascii?Q?7K9brp61rCGGnZEfNePB1AsuRW+GMDT2vMgUSE5mxP3xGvtvf66ENO13JEV8?= =?us-ascii?Q?i9S4UdfsoF2aOd+SBP6EykHnKW9YJa+Xi7h/CtX1dQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b5efa182-2754-47fe-7b91-08dc71fc5158 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 20:52:49.3033 (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: PR3P250MB0370 Subject: [FFmpeg-devel] [PATCH v2 17/71] avcodec/mpegvideo: Only allocate coded_block when needed 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: It is only needed for msmpeg4v3, wmv1, wmv2 and VC-1. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 130ccb4c97..74be22346d 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -596,11 +596,16 @@ int ff_mpv_init_context_frame(MpegEncContext *s) } if (s->out_format == FMT_H263) { - /* cbp values, cbp, ac_pred, pred_dir */ - if (!(s->coded_block_base = av_mallocz(y_size + (s->mb_height&1)*2*s->b8_stride)) || - !(s->cbp_table = av_mallocz(mb_array_size)) || + /* cbp, ac_pred, pred_dir */ + if (!(s->cbp_table = av_mallocz(mb_array_size)) || !(s->pred_dir_table = av_mallocz(mb_array_size))) return AVERROR(ENOMEM); + } + + if (s->msmpeg4_version >= 3) { + s->coded_block_base = av_mallocz(y_size + (s->mb_height&1)*2*s->b8_stride); + if (!s->coded_block_base) + return AVERROR(ENOMEM); s->coded_block = s->coded_block_base + s->b8_stride + 1; } -- 2.40.1 _______________________________________________ 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".