From patchwork Sun Sep 18 20:15:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38020 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp855084pzh; Sun, 18 Sep 2022 13:15:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6UI+Qqlsp/1p9LE4FUrxS7cZsaSoBqD7PZ0pHVU6IK13VHa1EQdmtWVzwMXnhEJQkU9zj0 X-Received: by 2002:a17:907:a06a:b0:77b:9167:b226 with SMTP id ia10-20020a170907a06a00b0077b9167b226mr10913232ejc.421.1663532158228; Sun, 18 Sep 2022 13:15:58 -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 ds20-20020a170907725400b007313314bb73si17766185ejc.806.2022.09.18.13.15.56; Sun, 18 Sep 2022 13:15:58 -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=qhaoBBMH; 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 BBC7168BB9F; Sun, 18 Sep 2022 23:15:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064043.outbound.protection.outlook.com [40.92.64.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7632A68B825 for ; Sun, 18 Sep 2022 23:15:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dPjbSBk33bTFEnjPtrVxGBZ5bpw4f/tiqV2cz77rBuLx+RxHwJUd2cwpkwcwbRHMN/Gcovv6EhunuLXogcc2Bv8YpEl5GZK/TcY6Nj6br2VvoQ0jqrkIN+pC0QVdkZNQn6/WLpJxkab35t+DXkiErb4LlmPYfoASYIXYuUfkeaBQP1A4FOH4rRpKZ3qrznxje14loH3rkPvI31fjiKDQnbSg4ypq7yO2rkwOIz71sfL8EvGsNH3F9dN8X687ead4dA4dG7yX3M3ykvlAvnyEuKpn0008Tseu64Js7lnLTD6cSMIeXdUibeqdgEfiIreMm0C4BwPTXJtU4cWftRGshg== 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=MXfjJDz7q61/0RZyXFQzQAMla3So3r0Q8xmC4eR/lbE=; b=lkwx7eVIEE7C11d11xBXKjFAsJvlyBbOlSPwi3tJk2gW8cSfkeXI33dkYtkwNcNxJ0OKiYEJL7wib9xXOHOAASQYlGSsBHP3zN04lDZ4vLefAAG73rdUXZgyUk9cMXRkvRe4ijRZUyictt9GrO0kKybX4lTEGMBl4TPCcFHP0e5UXRVPVLRi6/JsfeaiJJyVZy61UsdmgSpupHr6CJ0h2SpYuaf2FimzuTUoQRxO+PhUomVoVevc/7efc0kplidjhMA51k2eAtM2U7KuZ7yjQRG7Xznz1ye/42598qJvdz9HX+DrBSOaciCnIBPEfOlYashA/y8EoYmzIrak7N8hig== 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=MXfjJDz7q61/0RZyXFQzQAMla3So3r0Q8xmC4eR/lbE=; b=qhaoBBMHHGIqAiWLFkeHpzNP9C75jXs/mClLBTsHbRF6DxtUKRAuZkn/3uS64mdhmu9xXMLt4K9LBdc6iMyOlXu6SuUJ/LviyJ94jkZVFw5CtD/We3QahkvWAIVzn1tGWWx5esPLF/uMQI5sL43Jtzw6ayaQmMrJhT2JuoU27LRbF1YLumZg6dwHfb4g0cm6rTUKK4I2T2DIOoMWehBVuMqZbm4+6yGgNYUQv6XDrKQNRJfbnTraAsrx74ZqcQLaMBKDn5htTtq4PKfTvcvDixXYTOhel9zU+YCF7QAUe2cC0WpEFULKxyOc/O3bRSYz4WqQgVwsx/9iiCTcUYH4Ag== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0439.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4b2::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.19; Sun, 18 Sep 2022 20:15:44 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785%7]) with mapi id 15.20.5632.019; Sun, 18 Sep 2022 20:15:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Sep 2022 22:15:23 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [3e3i2ga8S72jZwxV5FWSilC9nrhBYeCz3vPZqNIhmnE=] X-ClientProxiedBy: AS8P250CA0004.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:330::9) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220918201539.2345217-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0439:EE_ X-MS-Office365-Filtering-Correlation-Id: 87d7f22d-92d2-42ed-a8d0-08da99b290aa X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3nf+gHZRpQ9KUHXFvRxTwG0LjyUE/XD4dw8QEcRIvQrAS7scCJr0F/4HrimuIsRkpC1+uoHT6xLKQ60Mg89vwfxMNemIiN3uaEPUOBLq1KX3VjaxTqxmQhY65y6m94fVvGNayr7T7G1XxFuZ7we3lfSW1SyUCnoqmGCPICzACtZc2tkIKzkYrpOq/va9EaU373AL108zBwWOoZaI7ozjNAl8MYHeMA+pKbpGrg6C46we6BEqWc7goiRCQroErpvGJyH6ttgcxt9IbeinKVw9bdgUdvE6U8RNx24hlxsDseIFpM4Y+6jD32bvTEzgkY2vvPjZ8N98YOGaIdcw+p6SxtRuzmSgLHDtWiQK69sgNHYx6dajD8WqZYxXcupT4zqVTZaKXW1pCcel4LK3Ne3a+HksLpp8shLxNadrnCvYaYgpDw/CTXTDBH2xzUicsYTYhn9okMKrK0bUict6FUrrHEC7OA5xgihzKEVX2GSaUUKeUSRpGiTSGSQkxFvdM59R57oqQlqrneRGMoLPHwlGeCR+QRw6zP/WaV4lAJ5jhm6rxGH9OIA8qwo7BW1d5Co3DBqq0Fk/0tX32ynKbAjsD9z1vZ9wedGFfvF4H8T3kd3rJp6AKunMc3RPcjzWyNTbYabKjfUSwXLMiLgOaOzGGWPRcc8F9JmUAMm0Ijtrnm3e/pPPYXdPw0qzaWjZV3k/4g+eltG+3/Xa5IORX5dq3bnhVFPz2piNFssn4/+FInIEqxilCgiZ1+Fp57jUlWG2Qh+N2BadsfFieYw3w8+ngGC X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Wl+e88xYcWgeuHnmInv2Lq0bh4gfvjmWIgYsr0XoFv7gkXkjCSYNbO9Agmk349baJola85A+0t2mZkqHZ2dt91Sr8L/XYvZlMlV0H9x4ILtpBoUNQiiIMP7nr7PS0M4r8GeWbsaLqrZ6bCzbWb4WKlogTHCp6dyNWcBHWHwLatwtCjHgsdQ90eMiqZ9xNaovH03/hqPElzIm8FHVHJZ8+bgC4/OaT+ykzuIXWMqaf9teNI9iE368jDoYSgcLR0X4lJwRbKwROTwW3EkJNh9sElRcyK4WtiNQjYPmX003adPRjZacYPCHxSOADegurF/Txj2EFAJtrabU6Y9cIyXzeUtmf5DWiwcLVujnyecFuN4Ouv7oXiNGDLBSDkRa+CrXUF0NI4uHVJAtQEhVIgpy2SePBZU/9dJwjQOxlm12FMsaEkHxsEdbBdlsMSZlWXMJFFwyC6A6RV7UYqD6IqUkJ1ExiiR2qZkqYgTSsPAAC7FwjSEIbnGD4x769xl66LA+oy5m/7Q5VUONB2XW6VQiSSO/hdQOGu4u5IBYkGkeDoibs8nqEf7Ouh0Q7PCAFDLKYN45XLWf/1WY+4xK5Fl0RFYfw4hrE35nP/f15zUo1sVdnOnIMwpTCTDfihPggUCijLeQM6sNawtMz9DDzk3AcQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: o9WPHZmlOPzCnNxxD0IDI+AYWAcIQZMzYodYIiw+M8xcwSj/gZLRk5zI0xCxJE1JbcY9TG9M71PhK5ZwDxP+0mRQAvad70O4lm4q3XgX6jCSoQqj8au8M6Bqz0Qcvc19Q5STQ9KteGAzhPQUZfRBNCZOOMCEkT9tC6puVcN7TIFiIRrixkmvFVeoaf2lo30cXoIZHtHCd4WS4pbyEyEo6Zlr2XSLsvhktYui9NzLoC7uflwwf7Q0aCT+DPyhPnDkypsDc34sMQh6nyoFG5yurrXGpOzQpXO+m91qmHrCMgTdlxAT6HgSPtb/PeqjcFexy0FsNC1Xg8K4nA8xvH0cXQWAIXk5G4bzwwJDQmXQW9WDHlpnhEOTgXBMWTiuLhfHai32/TQawlFhbVf4/6Ur+Dww0prLdeX3dcREycqyzH4N0Zaxcn6QgHzYRtUTU9R7E1Ayphp7NZnxCcuMuNHExzpD/Fx+iJsrOoEuJyN8gu2iVaEkgKp1pjwwqgoLdQjoIjLu1omtkS05sWuB64sBarEYsK9MsRpbts/vclWAmPx18AFE1XdEFdg/sgEel9xa1U24W+gmtRdlwPWB6hNXzW7WXvk/Aj2K1ivRcTgCb9MUjZ2aq9916KIHvD9mAAanNWGgpWFrhve+RHU9+3jJW786v6JdCIZW9OarC1wBkvInAomlmywSaq+8m4QWK8Kvhv7o9G9n3e5ey83fNfIgRknrN6dPnqFWuqzYt/iuoBj8UN/ADzND2dxA+7DHPjzxyUszvDaJnQua4s45HGLnAET4uL8antDJZaOamnhNBqMzzK5Ci9bk0gwxbjZlUIo91s39HBPcHARSIt/1slIztyRB2KrVk964CKmElvg4hCGZ0YxSdBVR74UMpKSHivyDtecr2+KDRgcNm9BbNrCYfixjNw8QyFm1sBQIhHRe9lJiehJ4xxZsjcS4MbH28LUp4cAQDAFmE+n99mlAZfnEgS12h24nAivfgR+qASmxjEFEpr8CzpLdVcdn9azNoyRSxFHyfqN50bLWsF+vnsyJGFk9Q8zOcPsRh13kBLJJqz/zvX6LlxlNk1n4gxUJFE20Q5HKp+0qFQFJPpfsiD/UpQExXP3tTzRzYIB7/8DSMBIVBdHP9+NC38yOO33IgRSybQKEG38+myoO8M/epthj2nEcdQwenPDaAqy/l+Zz4FAqgers+LOAtzNBId7WrTZi/6GoRWwaFm8yILm+kqY0lkrGwQEDYJY0EDTdKlB7EyM0sQqcSCgCABJI1KXprlIxE+J5VEaCxoW8GCLTBiZrlPJGWIfE/nU2dV4M0Y3gmviGXeHKItdwps7DnerKYbX4 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 87d7f22d-92d2-42ed-a8d0-08da99b290aa X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2022 20:15:43.9190 (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: AS4P250MB0439 Subject: [FFmpeg-devel] [PATCH 01/17] avcodec/avcodec: Uninitialize AVChannelLayout before overwriting it 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: fu+oMXX+PCs7 Otherwise, there might be leaks. Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 29643199be..a165cdea95 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -235,6 +235,7 @@ FF_DISABLE_DEPRECATION_WARNINGS if ((avctx->channels > 0 && avctx->ch_layout.nb_channels != avctx->channels) || (avctx->channel_layout && (avctx->ch_layout.order != AV_CHANNEL_ORDER_NATIVE || avctx->ch_layout.u.mask != avctx->channel_layout))) { + av_channel_layout_uninit(&avctx->ch_layout); if (avctx->channel_layout) { av_channel_layout_from_mask(&avctx->ch_layout, avctx->channel_layout); } else {