From patchwork Mon Nov 30 00:54:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24191 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 73F2444AA5D for ; Mon, 30 Nov 2020 03:02:05 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5873F68A0F0; Mon, 30 Nov 2020 02:56:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f65.google.com (mail-ej1-f65.google.com [209.85.218.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D95B689CB4 for ; Mon, 30 Nov 2020 02:56:03 +0200 (EET) Received: by mail-ej1-f65.google.com with SMTP id a16so18033263ejj.5 for ; Sun, 29 Nov 2020 16:56:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=CAXKlQzBAL/zZFk4ILlVVyjjn0ijlOpk4jgh1Of6aHY=; b=Ft5jPVKhjfpHp1WyYNU5EOd+iAoRu1GQ5aQbm/kq3zV27TTdaYvsgXENnszEZ5QP3E 8nuNxId3G7w6pplK5gypNTd5LVvVN6Rc6csJ4ZzqmGz/6uWIADnv2vtS5TdbDX7Qg9L3 5e6C1SpgunUZQrx0h675JjWTWGUcUtM61vJ36pADEYG8y5JFelfLNypII21WAMfvuu0h R/GM4SSlcDf3onjCnHzSU7Xh+2qrb1A4yGe9WUZWMW27pM4YeQI3fHcO7fetJqTCivFq L2hGs0/NqstM2muaCkNUSQn6F183z+6QVA9k/CLLTOddHLmT6tH3UT7XTeqAEdXdQaLo xXjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=CAXKlQzBAL/zZFk4ILlVVyjjn0ijlOpk4jgh1Of6aHY=; b=daRxLI+Hle0C2xIW/KU2iPistVQ9TJy8lOlr1uJ5PPFLsDQe+IAwmlbStRaE30sUfm +REyf6kLB+5yVdQfKqHJ2FHeGz3ZrWIVJcOh2MdhZy9iUuwGi8ei6/CY2ZWTBqlCSPE0 IoIu+dh19zTXqM6fwUrhNYR+4gklc4k64nNo0uU6lT/dNSnYCJiNzkDN/E+ECIuffjrb 4DbbFBs5u8wC9hZNPqt7F5W69LtliEz9iC/IQYxwlzk7+SL5dK0lam2Mybbx6PqIC30G Nxu4PeKCSVedSGUK4PPp/ZclD46mWw+xaN8MWgtNdIS9nyALW87uao3s9QTAsDNC9DRs ZXiw== X-Gm-Message-State: AOAM533ZtyUo+UelpgOuXMnAa3r2Bjd/ArT8GmO1hhNX9sUwRZ9rCa8u TIi79+YqGugcMvtghHTb6QMuQgVgCcGPQQ== X-Google-Smtp-Source: ABdhPJzxpOR1X0z0XL1YMe/6X2L589BUkinMKWizLO52eIONWccPTbsMGZD4skCYZOGPN4uXz3Btpg== X-Received: by 2002:a17:906:bd2:: with SMTP id y18mr18314864ejg.503.1606697762859; Sun, 29 Nov 2020 16:56:02 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id b20sm3354993eja.30.2020.11.29.16.56.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Nov 2020 16:56:02 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Nov 2020 01:54:33 +0100 Message-Id: <20201130005454.110441-41-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> References: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 113/134] 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 a2aa4bdf17..e03af4bc87 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); av_freep(&avctx->extradata); avctx->extradata_size = 0; return 0;