From patchwork Thu May 6 05:29:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27608 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp988902iob; Wed, 5 May 2021 22:30:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6Qh0YpEbyrd/kEH29Fjmis4kwtMkR9b3lxszwPZ+YB8Zgz9/Zb6tIurvXmSrsHJwtCxsv X-Received: by 2002:a05:6402:164e:: with SMTP id s14mr74149edx.232.1620279013726; Wed, 05 May 2021 22:30:13 -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 cn23si1395321edb.168.2021.05.05.22.30.13; Wed, 05 May 2021 22:30:13 -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=iKjDP3RI; 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 F0D7C6806F3; Thu, 6 May 2021 08:30:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-DB8-obe.outbound.protection.outlook.com (mail-db8eur06olkn2013.outbound.protection.outlook.com [40.92.51.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1ED26803A7 for ; Thu, 6 May 2021 08:30:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N4zQFlSNHa48DpZV0ZqrP59nOjvkUnOiuVqFTM2d+iakE3bQ7izYj3zIeUkMqoR1nE2oQBACME1O7y0thkVgPIL3MvmAjvoHarYc5zR0vePQdaUE05jcg2WV6c/6sQyuph9EkuDLJ0+/gcUdyYC6mp3or72RrGXw93YulXbqJMWdskBilIe+V66CpBnzK/GARw1B9FySP6NVZxto0Pg4LYyICoYPavcavbWL4wvDUUhNHhO8iDuYg9TOSzn7TD4UdvQgtrBVgLDGaViuQfHjricLOG/2x4zdzZG9t7VlZIA6b/1rMowgYibjSar4VvKy9TNbJT216ihoD348Gf1AQA== 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=Gv7X+X4RZLPWKa1qBAdp81si5PSowjSQoKq+jmVQJWo=; b=MfU97aZChXFzgPTllh9zh9bBZSkZme41aD9jZkOgGLKE0ifII8FYJriWFkcNmq1Gma2asH4je0YuFGN+gLxffeDIMVlaDqQZLyp7CeGW3bSRhM65CkIVcUEgkWORmMbsiD5Vzx3KRwIJKcGApKyCoQ/nQDeLSOZw6ai66ohlpcQdRBz0/lHctKaTaFnrId8549NAxbSf/JtVnl4jpOQomrc/DfdteutpHTQXU2iZ7P7m67XG4Z2B5nouWR89gUcZuglEVIrhcC01JXTPqoYfR1tTRzcvicN8lFljW48PdiwIDRVrVsC9krNxHv720CQMzPl0QZjBq9Y7QCX3/gon/A== 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=Gv7X+X4RZLPWKa1qBAdp81si5PSowjSQoKq+jmVQJWo=; b=iKjDP3RI4SdC4li01HBq0sq1KYHzrcPi0l1Zh+B49oWQ18s8+frKgBhO7Eg0e2T8TnLxrVxJ4Q0lBJTCKpTNc1SeCza5t/3O9jS9fO9WcLqqjmg+i/WDdAweJusJZLkMVewIHkcXgsNzBgildHL0ycBTROuLPahnqijlxsq/sIi5gkhRLSkcum8guMl9b/v3ZbxZxLx40/NfuasppvJNP7kkCqDSzqfrITsp5Nv9p7JMKrNWuq3MGuCb3JBBrSmJs+gNyl1ZiguH9U6S+Kq3kVCmOA9vQMDm+dgj9KKXGaG07j7Th7aKAvRf4/4oHC6fLWaaa4lnGussm6gK9vCrkA== Received: from DB8EUR06FT062.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::53) by DB8EUR06HT076.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::458) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Thu, 6 May 2021 05:30:02 +0000 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com (2a01:111:e400:fc35::42) by DB8EUR06FT062.mail.protection.outlook.com (2a01:111:e400:fc35::393) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:30:02 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:7C503FC0424027E10A0FD9D432C7161628994A40DC2A5B2AF722942A554BCCA9; UpperCasedChecksum:7FED70343DCAE51D6A585EC26740D364363C274806D6573FDBA9EF421A8465AC; SizeAsReceived:7598; Count:48 Received: from VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b]) by VI1PR0301MB2159.eurprd03.prod.outlook.com ([fe80::d9b:66ba:63ad:967b%5]) with mapi id 15.20.4108.026; Thu, 6 May 2021 05:30:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 07:29:54 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [0n/E8kYQn3SzV5930aFuf2q/9w3duvxu] X-ClientProxiedBy: ZR0P278CA0081.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::14) To VI1PR0301MB2159.eurprd03.prod.outlook.com (2603:10a6:800:26::20) X-Microsoft-Original-Message-ID: <20210506052955.834103-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.150) by ZR0P278CA0081.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Thu, 6 May 2021 05:30:02 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: e12eeb49-8ef6-4509-a350-08d9104fff6b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQ2WpFcKeHQard1uCGdQvPTGtgDDrme2a3u8vbsZGsMRzOsS1d1Th+2sDoJUe7s9YqFYlgnbu67wyz3S7l32WIFKoYG061n1tC8PLi1hQrK5vI5n5dP/NoCAcZxVjkNj38tpUP2PgomWIpFTmR5xMIwxFsJ8gPq0aqQth2SR/cR7PdauvvCoNzMZDA1l0Fm8tAUrD9Vl21l0/83xWYC6ferdl8eMSytsBE/7LoU0BpthQ9rdVH71qjF67A332D/dQoGtsaLmFjIoEouBiBBTe6ZyN2fP/L+99YFsTdY6VkofhQqsnlo35/7au5NNq/BU/PUHQR7KnFfb6ZRXv7rNLhIReRMCcO6T+fBM/6/OHQg2TyRylyKZ1qKjTF0t5ysSeczG47xEkBI4gfjzxM1CT1Crt3xLoIhRoyPg88cI83hihJg8bGJIoO2DeuFEJIfgzI0+axxBYCpb1MuMEcszt4tD3HvCvg4/CtVLu5vofJq45HXf4eZY+ui9N9Hhf8rhTDrcBfCu40k4fTzsF5OReCQagoP3ljhVCvmR/qlYUV6CPmkdVcekB0DIX4qyR7Vl2pKonvguwNn84Lu0Jow2/NPi9XpkPBcxzY0KMHPgZ8+oxT1omvWfv0kl48+klpUDtx1QYdWyYDfnggmBod3jJ/HDCRr2fboMlp8SZcCh79TcDl7ZQPSvCDMDmnKlVaCmoRXFNrzZhIHGhXcKujLbS3Yd9rswjBzGPyIwE3ZBKYR1BkqhWsPvziO95x8a/BEHOs= X-MS-TrafficTypeDiagnostic: DB8EUR06HT076: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3vdOMMyEPXjiEx2CCn9iX6G4nHGwRv57LzD8bgs3EtRey9uazx0f82XiAKlnwtSiCBcQOZmG/uk1VYiz62nLXKuGautykPLbrtz5ErmW/PeEovEv8IR8mpRioy0Z2bgYh+6KUHwZGLD9/MGE+KlGZEYTlY6MGBLZfSDvIAvC8EUxUzi9Wd9rPDLRUoSySaLlIthXf3/N/6si7g+FNvvId4DAxRNpOAJ2DClEAi+jEbbzySulCdRuJDGPbM55y7AO4dTo50luU/+6/fRNyEHDDjo0D68OmePcb+C7BBdpBnZYYeZNdO7t9pAPEWMDXsR5Xj0y4NoD6HYMaQxSyC6piiNW1hDREk25bllmCDsxC/k/2tOh1tAMFlbpEwXgSu3AKwae9EFBhLFib7aoJPID6Q== X-MS-Exchange-AntiSpam-MessageData: BOCyzjF/mg/0n5+4rwHNv4M0riPTo5cg5L6UunOY3yreiYBCF1Md/y0KOpyARB0pbzr+fAMPuWkGIm6O7/g7nt+WJRtP5dVNhz6W9hOn764Iysi3EVRfda7QGkkJLGMHNSgrR3dLP3eeaBOABbDGTQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e12eeb49-8ef6-4509-a350-08d9104fff6b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2021 05:30:02.6049 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT062.eop-eur06.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8EUR06HT076 Subject: [FFmpeg-devel] [PATCH 24/25] avcodec/vmdvideo: Cleanup generically upon init failure 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: Foz/phqQA7TD Signed-off-by: Andreas Rheinhardt --- libavcodec/vmdvideo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/vmdvideo.c b/libavcodec/vmdvideo.c index 15846919d8..ad88a43ae3 100644 --- a/libavcodec/vmdvideo.c +++ b/libavcodec/vmdvideo.c @@ -423,10 +423,8 @@ static av_cold int vmdvideo_decode_init(AVCodecContext *avctx) } s->prev_frame = av_frame_alloc(); - if (!s->prev_frame) { - vmdvideo_decode_end(avctx); + if (!s->prev_frame) return AVERROR(ENOMEM); - } return 0; } @@ -477,4 +475,5 @@ const AVCodec ff_vmdvideo_decoder = { .close = vmdvideo_decode_end, .decode = vmdvideo_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };