From patchwork Sun Aug 20 13:19:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 4759 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp2960456vsu; Sun, 20 Aug 2017 06:20:17 -0700 (PDT) X-Received: by 10.223.188.81 with SMTP id a17mr8315468wrh.1.1503235217389; Sun, 20 Aug 2017 06:20:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503235217; cv=none; d=google.com; s=arc-20160816; b=kfHqdLJPZd9Zs1vuFQMttubh6a+puDVRdXk1oGeJvtG2+J4aDe8BS83rAIXSbq4XF/ TgkauqGBjIi2zPKjDC/n/tGqRWeCpRN7P4oqd0+UJqqhPvlF1h1MkGNI96IWN4ynMjVX 9JUOVeC9iRpcRUGEkoRKVDnrK//PCi/6IWeuhBf228VMQv3IvDUYfW5EE+gQJVLpJaWk kxiB+EKtVckTdAH1wbN+n81ZLY0DCwINNEoJyfocTq7OVPSTUy4BgNMcwYXMydwwJe6R IgbUtqZvHlw8aPYEJDMNQlivtwoc2067wTos1Vcs56jXnUv4iOOXraH9iVQxo3acihIV mtYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:message-id:date:to:from :delivered-to:arc-authentication-results; bh=PeMRHAfSnnLAMAtxSIBFVsXIFuASzIFhYk4429a8Cmo=; b=W+QqDhdapNfY/8Ul/pjW35cOUYCpfRG88orxlXIzG6ckb+aLq5CBGimLef5OxvxL++ +oLnOnR0KDLuN4hLWL2/WHTdGpvGxgAyaGGeenMOo0Xk9GNLIKaarfx3+whMf6CNrgru t6YvzHrq8JLgK0PnWEgzmq2AFZoxCfN9nLryh28QDk7v0SStYA3O/DsddEtG3P+4jK1u WNlmSo6ILsE7nqqC7iusc5pszaECkwxEGUusIGHUbFKmUyZw5vojaEFaK+LirwoZEZ6X LYNGqaFQJfi6XmVG2Zlvklgw+uV4sCdiDGM2lFHaGOWQniF+gi1nmKTzBakfRhlf9IhI 4l8Q== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q3si7608796wrc.106.2017.08.20.06.20.16; Sun, 20 Aug 2017 06:20:17 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C9418689A50; Sun, 20 Aug 2017 16:20:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg320.qq.com (smtpbg320.qq.com [14.17.32.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C9D9688395 for ; Sun, 20 Aug 2017 16:19:59 +0300 (EEST) X-QQ-mid: bizesmtp1t1503235099te3oda67d Received: from localhost (unknown [221.216.239.150]) by esmtp4.qq.com (ESMTP) with id ; Sun, 20 Aug 2017 21:18:18 +0800 (CST) X-QQ-SSF: 01100000004000F0FH50B00A0000000 X-QQ-FEAT: k/ue80zPaUdWCBtMKF8wlhnByGJ3vt4Tkj5LoHAD6U0fv3m2IdSXSP/FhFIiz 3O0h1SpfmPD8TAvp3tGgJR4UWEYH+VcUIhdZgYe+AWA2s1P1tyEOMUXic7pmNdCCAuq2XQc Ml7u/ExjMIofaYrRMkvR0NOF9G0LwHWrlglM80Z7s/T6Sc0o86lV1tT/Kpx3qA0Ildli04M fxtq8t34Wg+R+H9tMaeeb89EVcMDVKDMnR090zU/Pchd+Yw/xOJzIV1Hn4XM7wwRUidnb9b qdJI91mUGQPdqi X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 Aug 2017 21:19:12 +0800 Message-Id: <20170820131912.75663-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.11.0 (Apple Git-81) X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign2 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: move free fmp4_init_filename after hls_window operation 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: Steven Liu , Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" fix ticket id: 6599 Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 74a3249b73..4a90886331 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1745,7 +1745,6 @@ static int hls_write_trailer(struct AVFormatContext *s) hls->size = avio_tell(hls->vtt_avf->pb) - hls->start_pos; ff_format_io_close(s, &vtt_oc->pb); } - av_freep(&hls->fmp4_init_filename); av_freep(&hls->basename); av_freep(&hls->base_output_dirname); av_freep(&hls->key_basename); @@ -1754,6 +1753,7 @@ static int hls_write_trailer(struct AVFormatContext *s) hls->avf = NULL; hls_window(s, 1); + av_freep(&hls->fmp4_init_filename); if (vtt_oc) { av_freep(&hls->vtt_basename); av_freep(&hls->vtt_m3u8_name);