From patchwork Fri Nov 29 05:07:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 16478 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 37AA344A283 for ; Fri, 29 Nov 2019 07:07:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 14A5268B231; Fri, 29 Nov 2019 07:07:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpproxy21.qq.com (smtpbg704.qq.com [203.205.195.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC9F468B1EC for ; Fri, 29 Nov 2019 07:07:19 +0200 (EET) X-QQ-mid: bizesmtp24t1575004024tza08yk0 Received: from localhost (unknown [47.90.47.25]) by esmtp10.qq.com (ESMTP) with id ; Fri, 29 Nov 2019 13:07:03 +0800 (CST) X-QQ-SSF: 01100000000000K0ZSF1000A0000000 X-QQ-FEAT: M1J1ppP5VJsZiEmV3jnFmbRWXRKH9kJk1gxaNlXSx6zf+lKn4Sg3qWp5K6Gyj jIVKjnJ0qRGjG9pAWI+nXF3cmJ4/7w7Ki3XQ+rdxXBoUo9RdzOchRE9loDyvYH5mBeiAO0Z 3UF1t6yEltU3/w4ut3y1Y+lUt4FSe/Q7WeBiub1EmlSGVwZ004p00QCmvbS2jX+/575dPqh DQy2vrFMWRV8dyrq4B9/C19uXZ2dQlwEm40SMUdbq7WyskjRdxroI49nVzKazQIAcVlnQL0 zXDGjT+UYkb5CvgwuJMBSeRKNjPgOfxnpBbFUD9Yxz1mNWN4r1Vrtf6YwyomacSSlOjEAM1 v9lscvJ X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Nov 2019 13:07:02 +0800 Message-Id: <20191129050702.29381-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 v3] 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 | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 043438368e..f90016901a 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2486,8 +2486,11 @@ 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(vtt_oc); } + avformat_free_context(vs->avf); + hls_free_segments(vs->segments); hls_free_segments(vs->old_segments); av_freep(&vs->m3u8_name); @@ -2619,7 +2622,6 @@ failed: av_write_trailer(vtt_oc); vs->size = avio_tell(vs->vtt_avf->pb) - vs->start_pos; ff_format_io_close(s, &vtt_oc->pb); - avformat_free_context(vtt_oc); } ret = hls_window(s, 1, vs); if (ret < 0) { @@ -2628,7 +2630,6 @@ failed: hls_window(s, 1, vs); } ffio_free_dyn_buf(&oc->pb); - avformat_free_context(oc); vs->avf = NULL; av_free(old_filename); @@ -2956,31 +2957,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);