From patchwork Mon Oct 21 02:49:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 15876 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 5E93044A4B9 for ; Mon, 21 Oct 2019 05:50:09 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 44B0968B00D; Mon, 21 Oct 2019 05:50:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A70DB68AFBE for ; Mon, 21 Oct 2019 05:49:59 +0300 (EEST) Received: by mail-qt1-f194.google.com with SMTP id g50so4561067qtb.4 for ; Sun, 20 Oct 2019 19:49:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Q1lhPdyQybOzUIDpmKc2qgqKnh388pputeZGugJTXew=; b=L0Sz0Z1GJAUbZNAqqr7m5yCkQZcFAjD462HkMIwBWFQ3IUqWajYAdD80CS1m7+B0/C GQd2XbgQWXMcTwdnRklXSYRB6hpJFCUAhe2UAAgAaBENZOjm2OCytHitEBAxf5PLlDgf CViGSRaAlTxxCuOyAQsyopICcDCSTyqM824wwxIKJaZvIruriRqRyqqW/oUVSXwXwsFH c6FCwyWJOX31NmFpRf6IEfRV9ib7AsZwJA6m4yDbthISqTDUHoFmgk0H5dY1B8+kxY9T MtMzEz7qMd3MWdEzkL3U7Rh8HAz14d46sicvM9z3Q3wG8oLI1QY5rckd0hdSxmRCxS3p +P2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q1lhPdyQybOzUIDpmKc2qgqKnh388pputeZGugJTXew=; b=Mrzvv3qkbr4BFsq32PYX5hHdLAZU+/47hxKHD4DZ+FA32ABmL2wFW7l9TmnLww1phG xcQ7WRznx4+0YrQKgR7exGzU5GNmro+Ei5QVxkiclv613fEozHCeNYRL6BnBse5WqAn/ GwfMzfMZuDVv5mcDMTxFLGOowxQPoHvE2uxIuZdVz27gngtYsIX3FEt02OsOsyZAW9TX yEX+t8zywdNQbn5lTYwV9RVEK/kClKYfPS7tF5Es+C5GcjaeHvCzVe0mCmwXwYye5Wf/ yJf35K9OHo9+xMulESPyXiMyg7pY4Y3B01Pisa5nX3a8zXfEkL3CXnn6mw9VZs1s3Hb0 s0BA== X-Gm-Message-State: APjAAAWNZy/OLiOkrVNZfivqq7vceYA/gxQaQstB0xtjVNteECpTOho4 BLFwxn1Oin2jOEWE+PeQQ6TobOgl X-Google-Smtp-Source: APXvYqwv1oc8JDEU993Du9DxVNS4Huj+QKmODEW3brG3CjiVD+fItPK273D40c4LVqBwNzxYPYtCnw== X-Received: by 2002:a0c:902f:: with SMTP id o44mr21254975qvo.192.1571626198384; Sun, 20 Oct 2019 19:49:58 -0700 (PDT) Received: from localhost.localdomain ([181.23.69.30]) by smtp.gmail.com with ESMTPSA id x8sm3101302qkl.78.2019.10.20.19.49.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Oct 2019 19:49:58 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 Oct 2019 23:49:33 -0300 Message-Id: <20191021024934.1624-3-jamrial@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191021024934.1624-1-jamrial@gmail.com> References: <20191021024934.1624-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avformat/flacenc: add a 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavformat/flacenc.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c index a07260f426..93cc79bbe0 100644 --- a/libavformat/flacenc.c +++ b/libavformat/flacenc.c @@ -348,11 +348,17 @@ static int flac_write_trailer(struct AVFormatContext *s) av_log(s, AV_LOG_WARNING, "unable to rewrite FLAC header.\n"); } - av_freep(&c->streaminfo); - return 0; } +static void flac_deinit(struct AVFormatContext *s) +{ + FlacMuxerContext *c = s->priv_data; + + ff_packet_list_free(&c->queue, &c->queue_end); + av_freep(&c->streaminfo); +} + static int flac_write_packet(struct AVFormatContext *s, AVPacket *pkt) { FlacMuxerContext *c = s->priv_data; @@ -425,6 +431,7 @@ AVOutputFormat ff_flac_muxer = { .write_header = flac_write_header, .write_packet = flac_write_packet, .write_trailer = flac_write_trailer, + .deinit = flac_deinit, .flags = AVFMT_NOTIMESTAMPS, .priv_class = &flac_muxer_class, };