From patchwork Mon May 30 14:03:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35983 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp2292273pzj; Mon, 30 May 2022 07:04:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwgVRt3IPxq2YIH8Y3CrTlDc/l3OBttj+2mAAEnvOc0Z77+akfLkIFno1fvOLPHXTsDtY8j X-Received: by 2002:a17:907:970c:b0:6fe:fd7a:9664 with SMTP id jg12-20020a170907970c00b006fefd7a9664mr29741901ejc.99.1653919440705; Mon, 30 May 2022 07:04:00 -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 ji5-20020a170907980500b006fef81c4489si10828235ejc.627.2022.05.30.07.04.00; Mon, 30 May 2022 07:04:00 -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=cUy1hkW2; 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 587C368B480; Mon, 30 May 2022 17:03:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069050.outbound.protection.outlook.com [40.92.69.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D4BD68B480 for ; Mon, 30 May 2022 17:03:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VYZ9rvJ1gq10aSHOGhyAySKCgvxCerpU1YqYExMN/A6Cpk6A1mfMdRlkzT1ZPo/0ekuYH0WL/2s6/g9zqBT125JWqozcbntWnCylP0USpLu2hXiJZorLTP4h6e/2rpZGa4u8QByrGt+6sJSTvTIMP19TVXuEDdNetai0Qv/MObNIf2x+cjY5skCt8goAkIDPFDgbnIQ94IYOeE3A5DiKdskCcDWUt/FHHxxFClIh1xkBTl4QX3cdUq4yTAgkNwOL/WC/SDrLPb90dhNJdIatseNJrwDEYdzXDgqgGWoqmXjsEUG+3NeOCi4bn4Jb7dvVoZ2xS8BjfrUx+yzN1Czhzw== 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=efo7xnGdgMq4o7dqBVQmjYFktaNwB+D8xhBjVk7TATs=; b=ZsxJ5DObT+Xqx2NT/oAhbL9jcsjFZLomEzOkKHCv5ktDMg9D5Ti91DboE4adGb2tyY12/a4MWIt6esvyckWrnYgD02EKyhuH0CLx08k+xKyDQ6IQf44D4xh6N+2nbfFndH+uP5yLyhxDnSynSMk+ZL7tCHoPYOBD4ZzdWJS6l9Kvpc4g5ltJIWdAp7sU3w19BATlsOtnvg8wt1Wvg/Y5CeVi7y5HNigby4ImbhtxK1izmpmFEeVilnpMr5yMDa72AMTI4lR65WYt/Acvq15jFt7LXasdgW3FvV40KSL/bHv+A+NPLUOC2ScWzCW5ABFshTLJb1kvjGmZ92HwDYwDxg== 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=efo7xnGdgMq4o7dqBVQmjYFktaNwB+D8xhBjVk7TATs=; b=cUy1hkW2CDfSwPSj927+b8zrhgS+AyRg+NlZWPgCRwqwCw396PXgflnvCsDYPMbSY3x7IvY25wwF3jn4dteIGhjQl1zZPGcAYY8JvsMNHHkEzIsqyYjWWstqppeq2IU+yrh8w2oJIkV1BDiyPot8aBNIwoc39kQw+4FZLVfVp6Bxky+/Ha83vi2wbhv0mRlmAFzsxpXc3W+43FTLrV+yvQi8JamFv5V8YlK+6Od8fmfezazdzCjWt6xtRVITezlHov77nqKchqcM79B3eSW4ofiU4uf0eNoOzuIHaWGj0VyolNpZOk0r4OKx+01zlVcfzQx3D2rSYyjbcec2N8/EYA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PA4PR01MB9018.eurprd01.prod.exchangelabs.com (2603:10a6:102:2a9::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.19; Mon, 30 May 2022 14:03:50 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5293.019; Mon, 30 May 2022 14:03:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 May 2022 16:03:35 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [1Al3Ro91wpRVkspxMVIJah6bTX+AtD5L] X-ClientProxiedBy: ZR0P278CA0008.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::18) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220530140338.636468-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ebba81e1-5d91-4955-9314-08da42453912 X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3UFAju/N0FeFphRCLv+xrPT8XQo+aH/dwTsIWQga37fBlCG9g6O9vdqDyLznLLmFQyjuGTQS9R2Ct4RAD1NXH3cEKMQYKQ8iteAk2h0CwisZSFjHx+c6HxS7BVSOn4uAcZWx90ZSN6GaZr12RzAO8v5hCGRgOX7nLLdTmoZ6ccei8sUitzYY//Xzilp8HrEs0qj8BcQFpQAKCD84XzfCYzI84/FRr9j4mhcZIXteo3YJv1FCTb1dj/+H6XPDPX7G83ha4M+AFoiLYy0BfopTmNu7zg3SW2eYDNuJm7LChSO8ETMlf7+bYc3tVEirlG/Fqj9MzQqaZHK0zwb4+whEIgyam288Ck3TIVFW4OxdU7MzQ5C6JS/+1iQ96T7Py54v2mBV/+JAQnwvkqRfWoGLva1g0BrMS2ezXMqOfzDmJXAUYqiWFbIMiyIXUFFTn+UYOVivBRstukBbCwoWn6/mLTuyWYmkQ0z6wMfk3JgVztrCD/K0dFNO7OGzI3KOWZMOQD6rwR9kL4/2Q18hdDJ0Ch1+RGAE/W8b8bRQZtlYXWUB3WcRX8Aafqxk2Er+wuga37dMCMFze1Wu4dLgj3+sefvnseeYDBr9PGY8BWoA9Oeu96fGr1v7RZ4pd6czRs476G3ywnmxIfqLWpFRy/lLLVLmDKeeEu8PQTUTNKFzDyrbSGrYSTB9i+93PmTYuzuWTm0j3p6qRmdnmO+pXGDIzIi5psoWxH9FvM= X-MS-TrafficTypeDiagnostic: PA4PR01MB9018:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Gpdzm2RigoFt+X9zOlIbeqIpj1VeB3rHlvrAr6iCQORilOHak0n46erVnJNIM24jf7UZRWaP59hTf5GhRBJjOGWgxTPrIB0wqpJKPGM7085Q013SpjqazsljTwHaMihKxVDyvR+b7k1rr5MyqYMT4E4IaUbVv3qYKfic2Zix3a/AMxoUnDE/ky4G8VjS71zwb9J4FoHwVxQu6kMgPjrn47/YUs5m2iuKYuoo+zvsg/Rrqdaz6bq5tMy5P23xEUEh9QvzgdzPAiP5yKJv/880FiHKh2uE9UHV56cRhW28EVKDKS2lfCFebVyhMakwLPxeKooAcyteix2NVEwf1WnqEb3c50yq/h0zROI0xcIzGXBzegAr51XBLOEIkyqd57TmmxLynXhDYDCZ8K7xU5fZ4UiQng9EhdI8VTY8xIq8AFIo/6NmDRCNN35305HPOQ1BHjeitCvWDpx3I1Y+d8o6spxkkKLaH6kokICpndhXfUN0NdQZa68ewPMXAxVdJ9lbI/4pAHw3W9Qp0v5uzV5qL98f66Ja7dyuquSEEyDLhB3z2Ex9bR+cTat03iJiFrlAHL7uVBljEWYJPh3AFv92iQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zdVxwWHKENqGcbIWS6iabA7MxxqG0J0xOYUGr7z8e4o7mMxTxNOY6+uKot6M/61TJFXlHmxrduHQOY/aWIjGj4e4kKhW5UlcdK2woj25EZmT2bUg45AMeflUBQKB+P2v8K5mGzx0OAGCtVoqRDVcfmBj8rwwP3vzpHjGEPcWDWb4fJV2xjJjzPzwA1j805St9cPv5I24VzcxmVNXXLuCJBL3dB0UqUOJLGNIBB3mIX3pA42FsHrgs7j/LaqrYl0qBHO/2uwjZOyUk6OR9lqT1OTV/aUzHAH51CqScCbUXm6S+/eL8EYO97MKPN3DBB8lOEfvaxJ6smtknnwPOP77E+rGdxvmXzpy8LMJuDMVS9/OE4b/K2912WTK3T26SHWTL/tTOTmyycBn+9Ad5Lg7QewZmiDOBfvPqPru/ljxSnEwctcLQGFB0V+Yw5GFnBnQ0+0v6mv+e06xydsHE9AIYCF63mSqf243ntSVLtvGmaMmGTTQqFoDvN+W/u41P7QXoWILjQS2vx8Al7y0HGhafkuwHwDfWTVWBwzhuU5VgCRtat1SrxfxoKzBLgIfOugVbQzFrGJKJiEQCGmCAXa5quyxlsT+X3tu+11OuWxwQvZQUbihBVgYEEbuwVR2qI74IXvSo1NaghrNyStJgwqt18hGgrYj8O2pUkTiHfvOlUzJk5PVepRkfLvaT7fb3WZXtAZcmwkxE6Zk5kRnQyFurWZKyRmRJYK8R9YoGjTT++vke0FLRX/dSc8DtKQcSUTxV5D0USJXAGVApAOsh/vrm1iRFffVPMES10wBta87+HjneljzC7BlO1+COTF/iPDwmotgEP84B4EsEQZb64xXNKfDnZCw1EQCRMJnj3WMifXVPfFo9drWZNg5TrIUzr7mbDP2nSjMIPzN4UiPG7LriAb5ll+InnXlNCoSXkVFm6S59yPupCa/s9a4Cwm8DBJw5gwOJ+EvYUpysTgq+s5jG+0u0TmyWyokAKDYX+kJ7You7H5MycLCAKl6c+xHaOry/5eYvYzUkNmQG2UeRg+BxkcRvFzQL29dKcqUNfX0bIIBEJawAMPYZLos+pLD2lYSnOYB32YWZqm1PCxubX8psBnn/HPNKybSU1G3ydfA9L2/ZrNT3n5H5qwFYI8yfVwvPsS/P7Xaokhm4ps86iD9PrgPQRVDikRmgUdQChC9cV8trbL14ySVDCnWzYU+GkyM+v2jsta9J51qsVf7hhJZXs4pdQg7IDc+7cxSiOqJAmG6mzMVGcJPh7Ct9PqoyqzIjTBLQ8k7vfNtuw54fHlvEUHnuJZzjpsmL+b2LTHN12LrHvdr2o0OIhaGsV3q0IPmWDh3aYZBq3KP0NdV61DFG8QdfueuI/QdijzUMjySAN3ZK9hddrDeQ1B3oKN2YRZJITNzZUYFSecoGq7Jb4FIbpoxyhhcGFGCR2JADvDXybsy4GD2XlrYuj2N3WADuhIC5btMf2auqiBnyo/dHesn4w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ebba81e1-5d91-4955-9314-08da42453912 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2022 14:03:50.7010 (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: PA4PR01MB9018 Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/wavpack: Remove redundant av_channel_layout_uninit() 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: VCD8YQIzYVrF av_channel_layout_copy() will uninit the dst channel layout before copying the new one. Signed-off-by: Andreas Rheinhardt --- libavcodec/wavpack.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index efd9e0fdd0..8bfbb654e8 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -1541,7 +1541,6 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no, } ff_thread_release_ext_buffer(avctx, &wc->curr_frame); } - av_channel_layout_uninit(&avctx->ch_layout); av_channel_layout_copy(&avctx->ch_layout, &new_ch_layout); avctx->sample_rate = new_samplerate; avctx->sample_fmt = sample_fmt;