From patchwork Wed Nov 27 09:43:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 16444 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 EE7DD44AE53 for ; Wed, 27 Nov 2019 11:43:34 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C73DB68B0BA; Wed, 27 Nov 2019 11:43:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgau1.qq.com (smtpbgau1.qq.com [54.206.16.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71F7D68B018 for ; Wed, 27 Nov 2019 11:43:27 +0200 (EET) X-QQ-mid: bizesmtp21t1574847791tolugasg Received: from localhost (unknown [47.90.47.25]) by esmtp6.qq.com (ESMTP) with id ; Wed, 27 Nov 2019 17:43:11 +0800 (CST) X-QQ-SSF: 01100000002000K0ZSF0060A0000000 X-QQ-FEAT: IyFUh2Wdp9qIuLrVIeISH8PFAp64eeNL084hXf5ia9RHyYRXF3S3xAjXoT96L KoRVfDRKt3MeCrNOgCPIdPll1Bgd56RG/3kkfHbYcosPYsKt8qDjhxLCMed5TOEjDp85ORr SrwTWpy+o2WGhHSaCJLJvhFCXvvDYLWSPR02i0VOMsDAf9uW902rZzS+PqXc8rpuDVq0dwh YLJQ1/5h6amOtiA53pSPapr7IANeHB6A2lX5TDqTwhnWTAY3aVplQC56cnO2qWR7ERgr67F AxYm65zsGc/CUAnwKOMKRGmZDIAgSRNlYgjvnxXYO8NGryBzm8chl/ELWqcOJTARcWh/09k LdLfa6l X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Nov 2019 17:43:09 +0800 Message-Id: <20191127094309.25156-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign5 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: remove duplicate code block 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 043438368e..1105380806 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2486,7 +2486,9 @@ static void hls_free_variant_streams(struct HLSContext *hls) if (vtt_oc) { av_freep(&vs->vtt_basename); av_freep(&vs->vtt_m3u8_name); + avformat_free_context(vs->vtt_avf); } + avformat_free_context(vs->avf); hls_free_segments(vs->segments); hls_free_segments(vs->old_segments); @@ -2956,31 +2958,14 @@ static int hls_init(AVFormatContext *s) fail: if (ret < 0) { - av_freep(&hls->key_basename); - for (i = 0; i < hls->nb_varstreams && hls->var_streams; i++) { - vs = &hls->var_streams[i]; - av_freep(&vs->basename); - av_freep(&vs->vtt_basename); - av_freep(&vs->fmp4_init_filename); - av_freep(&vs->m3u8_name); - av_freep(&vs->vtt_m3u8_name); - av_freep(&vs->streams); - av_freep(&vs->language); - av_freep(&vs->agroup); - av_freep(&vs->ccgroup); - av_freep(&vs->baseurl); - av_freep(&vs->varname); - if (vs->avf) - avformat_free_context(vs->avf); - if (vs->vtt_avf) - avformat_free_context(vs->vtt_avf); - } + hls_free_variant_streams(hls); for (i = 0; i < hls->nb_ccstreams; i++) { ClosedCaptionsStream *ccs = &hls->cc_streams[i]; av_freep(&ccs->ccgroup); av_freep(&ccs->instreamid); av_freep(&ccs->language); } + av_freep(&hls->key_basename); av_freep(&hls->var_streams); av_freep(&hls->cc_streams); av_freep(&hls->master_m3u8_url);