From patchwork Thu Apr 15 02:03:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26917 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 03C4444A0C1 for ; Thu, 15 Apr 2021 05:03:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D4A0368A486; Thu, 15 Apr 2021 05:03:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065011.outbound.protection.outlook.com [40.92.65.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2EEE689A91 for ; Thu, 15 Apr 2021 05:03:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DiVi7Ylm+3Rvnmng0nrScbKt/75/nJolITJXvnd+YV3qcZ+sMTMIyJJ5/uA7BQVDsvDPhzzhyK3+14R4ThaJXrKola9M94v83WGJVkEAtbmvFn3gTKDm1wjH8tFjWkEkfmKshMVFxmtmkJC/4+Eo6OZ12V4lqiCY9Q3a6aWmcAI3eDJbn/QCIpIQ85ZlE76n1Wt5sZkMVxMQd/Ryy7Of93lNW0J8cVchiT53rjjsfvt2TTH0/80rbS4c1kp4Qa+ZbAne5sQtuA4vlHORK5PIEHKv9XY0swiX8VV2qamkDvon1T68SUJQDej01+5J7y7QlyO9c72LekLPqu52oP1GjQ== 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=Noo0pddUuHJKkRiY2yKOb2wkGkIYMfSLepRCtM2cykk=; b=fwDoRFUpMdhqtQ15Zs7RsAV8sNmuRLDzOWTAwnfKUYzihoMrHGTk39BqbuEeLiq3bBoij3Y35gC3BXZgqHnWu24R8L8wBcrSEkoJtoedAD6eBUld29X2RaoNYsMuibJRYiBteEjJQRK+AWaSSmYwVs5FHia3ckux0G+iKVPnVdC8rVpkdxCUhlroZRmnURcq3pqO/69DcsCRWz3U1LZwHqGaqJBC1l4pEQkASRJjl4Wy/pa08b+vnb5murki3fkHL/y6BQfKyikLU5OUMyemzow7AIoFVPMOTQ+TgV90iiah7wxbPcuM0PxpfTQb4jIwqCAcCDfMMthXQWFwGdo0qw== 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=Noo0pddUuHJKkRiY2yKOb2wkGkIYMfSLepRCtM2cykk=; b=jhA3h233gB1w8AWflnueOLUiaTjm7F41vZGTFCNl7DvcA2iZDJNzFNc1G+8yT2G9bZEPZehqIyd82XMRcJ3jCrnsmAyi3XBeStJmRZ7wMS8ANY3i23D+hH4K2YSElW5KEdFadl8j8jLyv4cqxYySF0Stb1ztwPEF8qygHdWnke9holdKXXoy0ZfP0LQvAZ2nDoVNdo/YMjYNKb5NJ7MlFPLZPCj51E9BwmT/B5rJUZnYl5YZnbeKBdEgxB+xWElyy+sXeuBHVWD/icDk++8dr+a4/VCLS2/ydnJe4DPWcehajJp6l+BWXv2gJiTktZKLGArtCDCRwJUoHru01IrGXQ== Received: from DB5EUR01FT021.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e1a::46) by DB5EUR01HT009.eop-EUR01.prod.protection.outlook.com (2a01:111:e400:7e1a::118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16; Thu, 15 Apr 2021 02:03:51 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1a::42) by DB5EUR01FT021.mail.protection.outlook.com (2a01:111:e400:7e1a::245) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 02:03:51 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:CDDCCDF88BF5870C2CD905D34E212CB50242DADEF4B51E2709C5B35332317855; UpperCasedChecksum:EBDEC4B7A00DB4580AF4AA2E9CD65FFB8FE49E66944868A754F756372C19247E; SizeAsReceived:7583; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4042.018; Thu, 15 Apr 2021 02:03:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Apr 2021 04:03:38 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [zYWa2A5WAOCDR0EdUh5xq4sgvRXpRbWS] X-ClientProxiedBy: AM0P190CA0012.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::22) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210415020341.1410917-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM0P190CA0012.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Thu, 15 Apr 2021 02:03:50 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 185595cb-0a0d-4068-0efc-08d8ffb2b6e6 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWz9ZT4nZGZNcXnZ2gUA/tfr0eVeoEdvYMXmPp0w6HpvVvyBHB3FdpNC/Bppub+iz6V1K8k0EO9FklZONE6NEy9AkRZ5glnkEXcxuFH3PHE0wysKq2v7a8UF83ouv+m7CJt4WDzPzW08LtGOkCW7CKKKjEbZAvMwRcPVncuzLQl07G+X15T2E+pwrjABuj7u9MzKLULOLrUmZSfo6LBDeTlHFY4+5FQ9g86i0srWhv0A3zpHeOQpV3ymMuJ3JmMudN+fjLLx5Cp7qUN/LKbu0BKD2MN8LkHR2VqR8V4nGEYms/QYUeqX9Ui9MbNXv0RBx8xOknP6ncSqaifd5lAzm3xNVLkmJXZJuXs72PSGBfR8DYVrdLnWBiMFl4nOGNgpWvSONCu42otx+aZGwFwtSLgoshbMk3lBgjk4F34yYkhpF4B+QCW8zmfSIASt71Tv4ArwFBkBLTs1CsBR4IHBJohGrvx591DgXizXpcz9xPmfSh0of+fkvx8iqq/ytpxFiv9DlvtnZdRtaAh4d+zJSvzpv4LScm2eysHubMRz2NzeFG8KoT0peF+A6ef2Q5NGHAGz0GjHTgOb/ZWGNH28qPE0gOXj9snqZHgIA/v8hNGDUBPK3c80YxWZaDGuzXQlCZNqBEKFOGqbmMl0RPycUelBkPimJk0Yjq8MNMZWOn72X+vYZd9N3egQLMTncib5gbBCEBy6N9ZYepuylTLfcgfJQkpkrI0oaI= X-MS-TrafficTypeDiagnostic: DB5EUR01HT009: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mzd2TNB31AT/DNCDUeRS2+LCzDq0X27EtZii35nkH/grUxUmfl7/8lBI6n/GDlMU5NORHcNoDcnfMC+/kp1gFgfFsgsqKl7Dc7NqmYxDd88K3vyiDIOBc1V/nvY8GGdfvNmfc/6aYq0XVn7o1nFq/dOH7UqkHBhyJETXO8zgPOnL5j4JBc+XEld8gPLTqb0gqTj1lFP5XYwC2gkPnoA1TIGCx2/eW58g3IZBNUSTWx3gGWMUukVoem4GMswYMpOVqrF9tlxyIlI0/bCZ7YVfNzokoO2sS9JDiWD/1ROFcSksLdCx+Rj98Cayr99xDUnNaOEfvTOHcF7ASLTyD/VN0shFjdk5KlDO1EvrLCH/s/aNAw5Mr7mNKL+zZ0hhXOxbn75yZ1oyG93GG1WdSTHALw== X-MS-Exchange-AntiSpam-MessageData: LznHEzCr1cNF+HtUfVSupeU0ruAun5d/dlN573NHdkCZsWtMIijhhfNLaToNCHrgF+QBim8xkl4sqh1QoihhIKnY/zWQrYU+bovjIMX1XDzpudWFC28bO0jorwvjeTNbvSSgjyvr3ZBu0DgYP9tZag== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 185595cb-0a0d-4068-0efc-08d8ffb2b6e6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2021 02:03:51.3006 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT021.eop-EUR01.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: DB5EUR01HT009 Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/flacenc: Remove always-true check X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/flacenc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index 32b2465279..f1e3e1989b 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -1449,12 +1449,11 @@ FF_ENABLE_DEPRECATION_WARNINGS static av_cold int flac_encode_close(AVCodecContext *avctx) { - if (avctx->priv_data) { - FlacEncodeContext *s = avctx->priv_data; - av_freep(&s->md5ctx); - av_freep(&s->md5_buffer); - ff_lpc_end(&s->lpc_ctx); - } + FlacEncodeContext *s = avctx->priv_data; + + av_freep(&s->md5ctx); + av_freep(&s->md5_buffer); + ff_lpc_end(&s->lpc_ctx); return 0; }