From patchwork Thu Dec 26 10:53:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16964 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 3ACB1449EFF for ; Thu, 26 Dec 2019 12:54:12 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 22CA068A711; Thu, 26 Dec 2019 12:54:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30011688157 for ; Thu, 26 Dec 2019 12:54:05 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id p17so5827277wmb.0 for ; Thu, 26 Dec 2019 02:54:05 -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 :mime-version:content-transfer-encoding; bh=U07kRUk44s/uq1iSmQDF+dbfTysOfotBxpyQgR/UfVE=; b=iO44FhWqgUBel0h7CBylw1bWEk/dTGLwSNQdrdvL1WcsnVNB28/SY10vF4q+1MKt1y seT5WdqBQ924o1GfJvgHXZZ0KYSCwqOnE1265x78rUcebzOCJ3F1hqQyEXb8AYOVygRj yrmlIivNeTq3bOPxf9fXZ9VJ7VlJ/Qg/ZUrKsy32aKCdS3NLV9qbqF2fdZPI5ACUXjj/ R2tDLPqDOir51xQNROC/D9GVVX/eDd3vCHTHxNN8oyLvg8Yw4BByJo0ar2UwCMlMwTdv zlLHegZKYU++eRkZF7hrN6zS8oRdcptRqSYIrYPtzUWrI0r/vbuk1vzqIMYwPxic6tT1 pwgg== 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:mime-version:content-transfer-encoding; bh=U07kRUk44s/uq1iSmQDF+dbfTysOfotBxpyQgR/UfVE=; b=Dw4ZYslU7HmtfkihwHWT1Fqe+yiR3cKXocXSlUJ8KvnbjPxvayetok6cjnBFqgJQyn 36bBGPJeplBYm/Phe7LkvOhIE+cUPepxvINqz6z9vdl78k4Qp5aUt3uqS9gz5qIGGHiR 8a8kH7bhCBhqN7JYmYIju3CK+/M9KXDrIy6GocgqGsT2GdYD7ldnznPaU8hXLMsHbijU ZWhYMo0qK/rBxpfTmvaNrRoPfmVzEoofCkOhOx5JmXAstbgmr6cSqP7H2yEVPvjgzffe st5ic664o32Y05egTOMYqeEzoaiXv+PjLgbCKaFDJEUaiCmg8Ydv1Ckq43dPZ6P8XsEG /YKg== X-Gm-Message-State: APjAAAXTWQUWqUyhJjXy7/cyy+1L6HgbQS1WmTEP3Bcy/kGpJZ0tPwDG 0Wqhmq9GHK6BgfH7MOftN9s0TPAT X-Google-Smtp-Source: APXvYqxL1pez5XkMBFOWDk+A9ibnuISp5aRhEum+7p/JS/on7S9nfQB+OlcNQmiTzms+tz0zk6EJow== X-Received: by 2002:a1c:20d6:: with SMTP id g205mr13591134wmg.38.1577357643974; Thu, 26 Dec 2019 02:54:03 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc10203.dynamic.kabel-deutschland.de. [188.193.2.3]) by smtp.gmail.com with ESMTPSA id c68sm7997618wme.13.2019.12.26.02.54.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Dec 2019 02:54:03 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Dec 2019 11:53:27 +0100 Message-Id: <20191226105342.11175-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191226105342.11175-1-andreas.rheinhardt@gmail.com> References: <20191226105342.11175-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/17] avformat/wavenc: Add deinit function 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 --- libavformat/wavenc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c index 159119d693..269793d571 100644 --- a/libavformat/wavenc.c +++ b/libavformat/wavenc.c @@ -185,7 +185,6 @@ static av_cold int peak_init_writer(AVFormatContext *s) nomem: av_log(s, AV_LOG_ERROR, "Out of memory\n"); - peak_free_buffers(s); return AVERROR(ENOMEM); } @@ -485,9 +484,6 @@ static int wav_write_trailer(AVFormatContext *s) } } - if (wav->write_peak) - peak_free_buffers(s); - return ret; } @@ -527,6 +523,7 @@ AVOutputFormat ff_wav_muxer = { .write_header = wav_write_header, .write_packet = wav_write_packet, .write_trailer = wav_write_trailer, + .deinit = peak_free_buffers, .flags = AVFMT_TS_NONSTRICT, .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 }, .priv_class = &wav_muxer_class,