Message ID | GV1P250MB073771239FECB9443808634B8FE02@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM |
---|---|
State | New |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp298784pzb; Sat, 11 May 2024 13:55:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUMiM2EM1DuyQ5qDKqzZHYSt6GoBukMIYfU5rjfkVFAJCn15IGo1qYw2oZGmmAU+0lkpBbsbsPZr786tIGUIoZ1hMCNzEXlEKyUVg== X-Google-Smtp-Source: AGHT+IH5zXckGj4V0j85jjaKkgGIp7eLt1in665Na8SmYXFJPVJ+IbzUEI73bWFhx7KGHanZAXnw X-Received: by 2002:a17:906:a203:b0:a59:a8a4:a59f with SMTP id a640c23a62f3a-a5a2d5d55e8mr207869466b.45.1715460948873; Sat, 11 May 2024 13:55:48 -0700 (PDT) Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a5a17c2c8a6si348067366b.1029.2024.05.11.13.55.48; Sat, 11 May 2024 13:55:48 -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=GqZ3sx9W; 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 2B2A868D688; Sat, 11 May 2024 23:53:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2022.outbound.protection.outlook.com [40.92.91.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A7FBD68D5BE for <ffmpeg-devel@ffmpeg.org>; Sat, 11 May 2024 23:53:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nNBs06ewDdk2PVe7ZzX1VnHwg7yufBlec+mHyKIJxkXWzJib57vkdMRmLtsFLTK+vthLoaXh8hkrjezditUOisCiTDIInEykwNsKdcTRUMl+mHgknZDpUb5Ioza5WyYIQ5uFfYxaRdWAgyczXPgjnKdaSCpWE6heqHoVjdWhvHclHRuDXo8O8K/KXdNFZbq1GAn0ikC8mSWBSX1aap+0r62Sjceq7rJqR6W1M9eIIDA3+u8WXNutfa78FB7yuzj7oxSHy6BW+y51/O0gqDEOLI1Pd+aVirOoCCjKvgm/cvZxRR5+//yzkYMNFfTaFGYRWIx8WTH3NKkC2p9edwe/tw== 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=c7WEPp1mpN1w7jmEt3F3BjBZp9aL64qipUSj7aE89IQ=; b=NCj+BD0qLrpolRH2MTI83LULK9lN8/0FUyXlaELmIYrLWWxxc/tCRHN5qqVIGUuzMWpPUm5x2djnHrynA8TWmGJXBngku0LcoRrEMXU221ZPc0kodgj0CxypAt8K+Mk8tuxs7Wp0dFAtIw5Obh7fVOVo/jab5Vhx/Ch48lYp0tP3kxkvlRLskvHhGUg2946/Ra2kgEJHuNyVKq4uveqC4/z0AlBhLQzLCAhejaIbvmmoB9JRrikQawaeq2mhPpRp3f0Q1+RV3Fut26IF+e8uE+pFJtvgnH0Fba7Q9xsiQvTaOKdZzBGRhNTy1r6vCrsHNmZXZYWcm1jdvic5+yqHFw== 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=c7WEPp1mpN1w7jmEt3F3BjBZp9aL64qipUSj7aE89IQ=; b=GqZ3sx9WSnWml6DosdBd4ZfXwGyHaMQGIjI4oOE8E5bOTfLpbLMGNiyjtGzP3/grzoZI2yh17sPt05ZoEZ6tvQI6swy54KIpLqdriaTuFEp/fnGoq+xU0atWh7WFJkUjuOyXRWjASPvBye0MeL1s98xxAIDR4jPzQHQc9fXafjiOWx5AvgRFcOPj/NZSRPWuUzRmpXalpVdI+y6mAhHslZnM8RLTl4eumBbJAiT4P6GpH1aXE8KsEVWKyqOdcqu1yOl2EaNZAxwbbLXrjPtaqzwFN6ePcih7JC+ZCcbg3HlE5WGlbJ0/5rzAIlIZoVULElc9cbOg9fP4pqcsLdikgw== 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:53:23 +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:53:23 +0000 From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:50:52 +0200 Message-ID: <GV1P250MB073771239FECB9443808634B8FE02@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM> X-Mailer: git-send-email 2.40.1 In-Reply-To: <AS8P250MB074471DDEA29072B2586F0EF8FE02@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> References: <AS8P250MB074471DDEA29072B2586F0EF8FE02@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> X-TMN: [DckcyNe33UYGfUyJO0PNZPSiDZs3ew1xbwhJ+lSbmr8=] 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-27-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: 8896905f-2e79-4cca-9df1-08dc71fc657e X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: 6mxeN07dUYq6M2Xos9+XNdTxA8fsCkv1+MTwMgSldd/KyZ+YnovYaFZ9VHuHx5B8sHW4470Ae+W2PWVWeYrV6k3WnPJSstwm62UGqcN5WXU/VKK1Op97OH6Up1NgtWJnajsxT+nwAS0OCRdNtm0pKa3md34UN3CoKWNAeXA8mf3GVirszIw78ipieO6h7Wwfspbs76lM1LJXT9j9QGxEVxquhItx9oqsgYEoa4qsCWdktEELq27n+bEzQddF8EMoKUV0asUyFpbeLEOvbHZRCVt06EkXWFfB+MmMHsTFyenrVqLrxRT3XVQGRqRF2mXQJGX8Y58dMW5loirCbAmV/OVbOpXGC7Pn/a8dzq5Falg4RCb/g1UKeFEfOK4/5KEzgz8TMGNNk7NYGyOFz5f7kuUMInOLYgut0wTmBvsQqQjiIpCehWSAEybn/n2IE4G2dJjHmZNq7O2MpKi09iFrYGROncoEMwJmFX1dglTIMHIIM3QrSPmPp2qKwPfRO/z35v3n0uvOJ2P2bN4zVIGn3CIBJw7VpBT31fzLr6o0iPeEETRH8GJ1+E7KAvfO98olmArJabLfWuBl7ekIsB9Zn5O98Wt8iG4sbO0CsmLaYhHzQeeBm/lbtRqSMvcDVyXF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lfz0FauqjniORzF4PHpvoniM9ppDXg8f6Mam6c6xrPa/wAhkeGfDSEL6lfDqLThw0Tx3+wMrh1B4V51uNeIJBE66sANUOTRDxp34rj+Fjm7sQpofaFcY7EDvDc7+FoFGk3d6UhQlH/dqlE/potyPtV3hWfK0GMH3hS39dvtTZ8ZBO8Q8QonQEWUQYJtmkoDLumP11KubmZ6h3x4qnXX402Wlm7LuhEru+Q9Bfwoi9cdzQkiOpfaPrp3PoNbvtKlKj+aYqU9a+DQmQ6bn6/x3uHGKhR/FVKkfWhdYJRV+b/nsdCjGlcmEIiqJC3wspH5RkEipfIhBvSOdU5QKhARW1iO5E8rvqfu/l6pbE/1dvGgh82AlLhgbZHeM7xGDSOwTRuwAyEPO4t1X1gsE3qCom4EvNhlmA7G+tObVw38C2rkzmOmh1XvGGpyDFztGAarTUifyvsJQgU7U5fe40Y/dkh1SRoF89tjzMqtJRD4ny66bUrKpGYdaK75gv95utQkdiA4E4N/4pdpNoLp26LSaiNHZFQhJX3VOgb1ko8o8vxe4SFgNZxWsgwUlohE2Ps3MvTB/Sxz21DWittJLheXXldOFnS49bp0DHsBM3VwtPKxOVRGBAKu0pFZfwwq0Xnnbarn41u+oKvXxg1Nnt61a9/mLmy87xSWukk573xJSu/ez0UOvTTa3twDGUvKz+4kGBYLos8I/emX7faULpiUPKd/gSoQd/UB6lz0wlRvUOfC1h23sUoF7SnoTM9SlVHNlCeiTnx44Ia/igB7msrCMo7AlbGtgDHXH5+MUQv3gWL9MUWZAMKz9ph6QB6/GsQ8RerWUVoBz/SGLHvR7P2bNbifngfzjMPIaa1JTC3T7EYEYCpe7ylGqid0HfC7wwnZ3k4G3FysIXInQkDCQioxsntAbtPrpSneYGNg/OYjwDdUr/TuDHoT4rTgForVCph4RrPjK1XLEnpEbV4eS8JZj4SJfpBKIAFmKYVb5YWbneN2CeyiYSsNC8YL2YZgb/ZURJUT03SlsgIJjQ+7OLQdRHmrFul2o64ToyQarYHjn5aNscS1DV3EkTtptNMmeGAAk1owu7vTz/wBqXJAusECJ8B4m0Ky5wW3miSIwOdH1wSeSmG9BZ5mzryANmPLGSOSppL6cWYwLyffwHWHnms9KE/23jcKuwD8p2Vll7WofoW6OmBexHPW95lDTafxenizPlkMZYUYuDd+Mt8sJfmAr+mfW3x+sNzEpK6W/ZmiTVco7HYzUzejmFqH6ZvkrbOIwmIoqTTyOud/Z96pnBHDNjg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8896905f-2e79-4cca-9df1-08dc71fc657e 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:53:23.1319 (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 28/71] avcodec/mpegvideo: Reindent after the previous commit X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: liiiy363IxBU |
Series |
[FFmpeg-devel,v2,01/71] avcodec/ratecontrol: Fix double free on error
|
expand
|
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 5c6ec7db55..d82a89566c 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -617,12 +617,12 @@ int ff_mpv_init_context_frame(MpegEncContext *s) if (s->codec_id == AV_CODEC_ID_MPEG4) { ALLOC_POOL(mbskip_table, mb_array_size + 2, FF_REFSTRUCT_POOL_FLAG_ZERO_EVERY_TIME); - if (!s->encoding) { - /* cbp, 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->encoding) { + /* cbp, pred_dir */ + if (!(s->cbp_table = av_mallocz(mb_array_size)) || + !(s->pred_dir_table = av_mallocz(mb_array_size))) + return AVERROR(ENOMEM); + } } }
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/mpegvideo.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)