From patchwork Mon Sep 18 12:41:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43765 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca2:b0:149:dfde:5c0a with SMTP id fx34csp1895413pzb; Mon, 18 Sep 2023 05:40:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEJTSthQvoJOPJMq3kLlC/k8hQrSXj6qbDoMUOY7UpOIQT72jT1t4cUr4RM1DPXZKfSTtoR X-Received: by 2002:a17:906:7381:b0:993:eee4:e704 with SMTP id f1-20020a170906738100b00993eee4e704mr11733028ejl.38.1695040823834; Mon, 18 Sep 2023 05:40:23 -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 z5-20020a170906714500b009888e599645si8456437ejj.771.2023.09.18.05.40.23; Mon, 18 Sep 2023 05:40:23 -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=AuEf4t5W; 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 94E5C68C82C; Mon, 18 Sep 2023 15:40:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2019.outbound.protection.outlook.com [40.92.49.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 861B868C630 for ; Mon, 18 Sep 2023 15:40:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LMdNmnJe6kmwDG1YD7vhWcTmsHPFFwciETPm8klsyGngQPX3lOR7TYf9f0NrXPECqP85jEogZQAWnwy6CgiuputSl8mlJrPc9eYeH/exwdBcGOXzq1CoNKK/euDhFLZjH+iZlfZRj3xoYZ4uy6pN3QI32qHOHODGMBIB+rOMZzElisJ8+BwV+MJ2sOyXtwxchov8EAoEvp1KEh5eqQJjM0X0cFIVIasXHbUo+p3Hj+hy+8sF7hTfMeGHWFsN5WyJXyzYX6c538dbkz5th0rmBJO4ddqSqo2iyw1BmNWGBN2phc992EC/9ExNxEkFeQKA9PMMUNLeMjF1VuB/wd499w== 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=qGb3Ha0dKtxUGizUtV4HggUb+ixge2u+xO9hq5lpDdE=; b=niHaI5UeHCMJwoi+vDc4mYZPG59rQ2+IyJ58QQhXX/OezrAvjcDAz15JgrbYb5DUQoDM3FfzjtE2Mq2hPm1iqR8HpAddt8fY3lZv/39aAS+B7SBZv10eAm5liLgHQtdXVmcB+ZajunR05mgK9q7SoqKiXndC4jD1D1UV/doK/avTuueCcKrDQQlTDLZ6ss5CxMya08oY+GpV4KgRoTtN5VpTksq39Nhj7kT9yFkIO1QzGRaN33cJpnSfPaDfbmBXAXgCVd34oACziwV0lhM/KrlwM4ibNvb20rNWSoPlCfC7c1pYDOXQhok5vofEtGC6Pzb3htNJAO7CZDjXetVy7Q== 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=qGb3Ha0dKtxUGizUtV4HggUb+ixge2u+xO9hq5lpDdE=; b=AuEf4t5WnqBxdZaaD26UFZdUaMkB24P3K/IeO8YDRygDI3Y1NRn5GhAhEC+iDW208iLqSRX95YeWmZWvhNWFCvrNxfwifA9uVs0SscUSklTTP+8XhkSWiXYNC79mRA0SjNa5Kq6ToeCsZYw8IkF95dmdGUf4mIiCxbcmqj6ga1PBCtUt6FzksrkUhj2S3a2zg8iNSulI79IGBpsOGksmOsI1GYOXswCoSTqxy96TCh+RSBeIEKc7HYkMa0a1YRdKCtkxE8e+by6r93/4ouZUmkQeUQmj2kizzgs9VCuNQC+CAbcBNmsBuBbCpwXQSyI7QTC2TUgq58w1fnCPVItgnQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0292.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.26; Mon, 18 Sep 2023 12:40:11 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Mon, 18 Sep 2023 12:40:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Sep 2023 14:41:20 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [/Z7I+CGNfbVqVfoGcAbBDAf32uoCK76u] X-ClientProxiedBy: ZR0P278CA0174.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230918124120.2297308-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0292:EE_ X-MS-Office365-Filtering-Correlation-Id: 4551d91d-ca89-4af4-06c1-08dbb8446623 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IHipjNDzR7J8ksd5N+YfeJOYon7gUFX6ZxWdMslldfkdbEUbeUaIrteEdBHS47s8PixMoEeeArsOA1xnB89xVT4YgXChzCkdEKvgAepbF+YkoK17vFOktgaO80tWwtEpvM67dUGPMGPePP5IthmC2eYdncecbaSydtJFwyFGheNT9PS3wTolKrzPNiFLtxLL9D+j9lxgU7JwzIzpv0c+We7gl+x68IOFq+HG6FUzRvIqLT1Ffwrs0xzwlGVtlVoESricamdrfD3U8o4fb/3vUiVCnXq4uwl/wTIg8+V3FJ6FogxIo0g+8d9a5QKRCGn8d5gD5094C7nbFrS3QYns28NdqJNYGq5kjN1ag/FwWAQhkAxM4q3AQGQhofLtnSgwf8P18aJpVHKnkZksMLk7iwOaIzwBBrEJCl98XGOXnFM0DNxz0HitnLOVO+P/X4Io7cXApn8kw9Vqo51CeKX5ll79AmBwroTVa/uLpv/i1mt0L2ynZBrVrtnRcmRokfJKDUDhwpMlwTzYjakWSzLRcDcAEl55XBBVg3z9NZq7hfcuFJkfUXz47gZYtknADF4SVJ//k/1ZiU7DVAMD/Z6dgpoP6rwfYV2SveV5mgieRqsUdNMQccpmFM5CEMh4Ref2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xIBM3jiNkSGW01WOi0fFO2PcGmqE5M/I9IeUru5HC095ZXsHUKX4qLNvi6yHvuyXoaAbGYDDhyX42H9d5/fBQVhlXcn0IiPfBE4R+Sk5c0QsoHHYuIq0+oU67dVOuk72vl7yGMKGDVml5IVd8DcGwiy8dMRzCgAFY5fj+EZ4AJwvgbvR7DXAcOrpTJ/LmL0MJGp5n6TiLitDSFAFQKgSzu0AG6yoyY+Paql0peLSTHsoREpXp7n3y0015wB24F+Adrgh1twel5ckthlZ9bQ6s9KynPwgSmXRBAJSDBAKBt0xXvKG7T092Mu0JmGg5dA0HnX1PiBTAvaw6NAax2TfksviLrmSXtXr8gLpj9kFyu9vdvMN26nrDpvQ3MwUnrcSpVuOKazUqop/fTjpPVlaB3c2mPvS1HmvdVj4gER8de6QULBIWFIC0+Yfvbwwg16kRtrLNNcQw0ICVCmIxNB9GEbi9nC6wCono7HnH/rNqgSNRKXng6YXqF2bWQKerao9YH2F4Frd47fUlvMfXX5vSuE7sRmyxl/QFsIGMiZv4Pilux/Av1VtFfW+pap/q4ltWaoMlLeXkEoM/eKkigfYCJG8uYAk6/sZsu0BKLgSVh1zJ2UuT4aki/BfJlyf0yQJE6IPSKLEtVaoG9Mu0dN9xnceYUkJ7r5yg49AMEWeqbym6pJBvHel6Nloboi5DEbI83QgNjRjD+E6OM4MrHp2fwwnRZQUJ0Xyaa5DP1+mhwMZ4SD7qyJC9XMYIh66wLtig7ZhiCw/XJAZ2eaYu+SfbMDtsUd8FapP/FtNwQ1L9n5rRVQrSvve1ua+lYlRAwErSGGk46Aa3Btz4q8ksn+xxhZDxsZGueXGurKtTjEwS8oY/lCPBfPVWRVxe9/+quK8WLxiu/OltTQ6aPMmudm9k+uWFjdDjwPMLQjc+Pgj0RsWZChYZcYdbhCMQVI3Qj9sHN4B1Do2FgxpJtYQTpRQAofxVk5xoTOXkrcXytCjxI1yr++EOw0wzXxUrf0I7pvDaoFqv6JdgMaFFFCMHHhmrWacIsXugoHsmbBxRxFb+LpGCPqEHkdaS+RCWWIyOMd4ZN7/znY4PeXTEoTyU4aCJLaosnzCo7/03waD+rueCKgPYjLa1KHgm6xPBF9kylgv0bFwXZYDgvQq4HrrKn/R1rBC5ewsqJkp72Oqu01MxybLxeiKF8ylI1DX3L3MD4Kalu+3K5O8qIJN7ClUpuFeim6jMzjpvG2I1i+PuCvvq3K9rZA/NMNADt1Po1rnnM6D X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4551d91d-ca89-4af4-06c1-08dbb8446623 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2023 12:40:11.7059 (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: PR3P250MB0292 Subject: [FFmpeg-devel] [PATCH] avcodec/libvpxdec: Remove redundant unreferencing of AVFrame 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: 69oUVJ6mQoK+ The AVFrame of a decoder with the ordinary decode callback is generically unreferenced on error. Signed-off-by: Andreas Rheinhardt --- libavcodec/libvpxdec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index 72ef5fa9a7..c6187fd5a1 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -317,10 +317,8 @@ static int vpx_decode(AVCodecContext *avctx, AVFrame *picture, return AVERROR(ENOMEM); if (ctx->has_alpha_channel) { picture->buf[1] = av_buffer_ref(img_alpha->fb_priv); - if (!picture->buf[1]) { - av_frame_unref(picture); + if (!picture->buf[1]) return AVERROR(ENOMEM); - } } for (int i = 0; i < 4; i++) { picture->data[i] = planes[i];