From patchwork Tue Aug 2 13:24:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sebechlebskyjan@gmail.com X-Patchwork-Id: 65 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.67 with SMTP id o64csp219170vsd; Tue, 2 Aug 2016 06:41:37 -0700 (PDT) X-Received: by 10.28.23.141 with SMTP id 135mr19959784wmx.100.1470145297715; Tue, 02 Aug 2016 06:41:37 -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 o83si3324290wmo.3.2016.08.02.06.41.37; Tue, 02 Aug 2016 06:41:37 -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=@gmail.com; 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 dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AFB9E689F78; Tue, 2 Aug 2016 16:41:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D64B6689EEC for ; Tue, 2 Aug 2016 16:41:22 +0300 (EEST) Received: by mail-wm0-f66.google.com with SMTP id o80so30871957wme.0 for ; Tue, 02 Aug 2016 06:41:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QnNXUBSK92FUybXc8uYeDsAOIN8Qk5wvroy2sXGzQ2g=; b=R9Eqf+sml6mlSVNrMJ39DLZzZu9/DhCYykEMhaTAXT+E66gccqE3+LKW+L+MnmQqgD TKGIFZN+gpudzmDlMQNq13yfa6E63z0BeBGOxl0HytGLHyHs4kDIxWqXl8QOYJh84ttB +NmbwnmZqjItdVeIQocnl5AMiChE0Tewx9dUUDPIYwKPsmmnaqpcusyIGhGBzHFF65sQ 8OieJpR07+twN2iuDZmhlG+fqYkWTOTZ7jIHMKu6+wGNVj5wudoZSbbWN+qUja9LnKFO VGgqmE6xN8ryHAI7doJKGCvR+r/+iptAuM9X9BMWY3VdtIk9aKdhqJGnkJ3Ca7vO8+eC zeJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QnNXUBSK92FUybXc8uYeDsAOIN8Qk5wvroy2sXGzQ2g=; b=gOl8PCfCRHubLtfD1n89tDWoe4JkjoEBAl3CO++MAa4R3fmiAZqoHNyk9CjzODZq3b eAqcXmYZReQKKKhKnse7kpUpiW2li+vrYDOXPwPs9GFkfjJ9/2+LxOUuZvqb9AyJx35f K1Ihwmep8i1xv8RBjK4mcTj/OU78y4+3Voced9IIqHDZHby5ZTCXTcqgzfBjCrATQANQ 0QewpKddrxMu+XzeH/Dt4+BCk2iMhpfq8Ohqz9tG+w6c7sKSW8q9bRyq9q8nCkqontQu BBkfoYl15o35BQboPFeufR8TjhaOwo+2m+SWhlyaeZ7XPBKb0g05zqFYXQ2m/ZGAZmYH LeMg== X-Gm-Message-State: AEkoousUXkcz5JqYpe7mAvQpCgvC5G7+AzbLkSmDFuEIgXRADJoVbst4m/tPgTGTx2e4nw== X-Received: by 10.28.227.11 with SMTP id a11mr63372626wmh.29.1470144277229; Tue, 02 Aug 2016 06:24:37 -0700 (PDT) Received: from localhost.localdomain (157.174.broadband3.iol.cz. [85.70.174.157]) by smtp.gmail.com with ESMTPSA id n131sm22060902wmd.3.2016.08.02.06.24.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Aug 2016 06:24:36 -0700 (PDT) From: sebechlebskyjan@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Aug 2016 15:24:16 +0200 Message-Id: <1470144262-13167-6-git-send-email-sebechlebskyjan@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1470144262-13167-1-git-send-email-sebechlebskyjan@gmail.com> References: <1470144262-13167-1-git-send-email-sebechlebskyjan@gmail.com> Subject: [FFmpeg-devel] [PATCH 05/11] avformat/mux: Refactor muxer deinit from av_write_trailer 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: Jan Sebechlebsky MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jan Sebechlebsky Move muxer deinitialization and private resources freeing in a separate static function free_muxer(AVFormatContext*). Signed-off-by: Jan Sebechlebsky --- libavformat/mux.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index b58e4c1..bc9c98f 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -1197,9 +1197,27 @@ fail: return ret; } +static void deinit_muxer(AVFormatContext *s) +{ + int i; + + if (s->oformat->deinit) + s->oformat->deinit(s); + + for (i = 0; i < s->nb_streams; i++) { + av_freep(&s->streams[i]->priv_data); + av_freep(&s->streams[i]->index_entries); + } + + if (s->oformat->priv_class) + av_opt_free(s->priv_data); + + av_freep(&s->priv_data); +} + int av_write_trailer(AVFormatContext *s) { - int ret, i; + int ret; for (;; ) { AVPacket pkt; @@ -1241,20 +1259,11 @@ fail: if (ret == AVERROR(EAGAIN)) return ret; - if (s->oformat->deinit) - s->oformat->deinit(s); - if (s->pb) avio_flush(s->pb); if (ret == 0) ret = s->pb ? s->pb->error : 0; - for (i = 0; i < s->nb_streams; i++) { - av_freep(&s->streams[i]->priv_data); - av_freep(&s->streams[i]->index_entries); - } - if (s->oformat->priv_class) - av_opt_free(s->priv_data); - av_freep(&s->priv_data); + deinit_muxer(s); return ret; }