From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2710E40F14 for ; Tue, 12 Apr 2022 08:16:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1588868B395; Tue, 12 Apr 2022 11:15:53 +0300 (EEST) Received: from out203-205-221-205.mail.qq.com (out203-205-221-205.mail.qq.com [203.205.221.205]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB99868B381 for ; Tue, 12 Apr 2022 11:15:44 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1649751341; bh=DGGH8/zjMkG3Svtjp+A9/+DkAUuJbvNATnRpWKT85qo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iO9STkE7Kp8kYijHYkqxuXzZVbHU+Khstrq1i4tYkzx3g13uqsAGZRv4OGecIUbeq YzLONZg9+F02J7lIUl77nbyRVmJz5BaPNsNU5zJwmt3Hl/i50W+rcD1BQJHY81eYWD IsH7sa2l9dqK8JtHBE2+4hPvcEOMnItaIzgcoXVY= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.68]) by newxmesmtplogicsvrsza8.qq.com (NewEsmtp) with SMTP id 3E314CF9; Tue, 12 Apr 2022 16:15:35 +0800 X-QQ-mid: xmsmtpt1649751340t4iwuh53o Message-ID: X-QQ-XMAILINFO: OBfNkvzAyASsA1A1aNrbAqjzhdUBlRh8Ca4f8USpl5HRfi3gwwOmCD0zp1uDY7 n20a1XblM8kYuifGIBtvK5pC9mVtMr6zNNhQ0yPy9Ra7j2xTlylJzW/+03VLeiuOmodzVBeghgxh 5qLCV235SSrUVW8WBpW7usyHyllYQhVzfiDbNplFqQldmqK6ayB9MP2buuG8j+hrMXVXq90iVB5e AE5KTUn9oUaDa+PkJAdhUKxMnWrZBIfOXy0vHXiGZFWXifSrmgmgdwDgBS/hnfSsY90Jj8sTs672 RL03tFbHKnmcRy5im5E0/e26o8EIq9sdGE952eUJV4cj5EjEl/aJj3wxgew4zXO5t7HBdkeBeQbs l7v3R1qMy5/aVdpQ1dGGtVTKYs1cD6f2w8Lj0AtmiONt9Ds/u20Q/QlUXjudvS3bkJVRUXD+qxnf /Ax31xXWOD5MNXB3f26zkSQyxSmApswMevLKZytuuAhaQAmfwkzGmkJpHlvLtExUTwa3bs37RtqR LWDl5jh0DhVVQyCtH1V1sHkE8fK4C7cOJ1qMBl0UyLko5xAPYBhOT6+eW8s1EkePnZ/newBFBNT8 DmA2VC3yF9La2v1UZ8nBGqt8XwP0ukUBzMZE1dWHS0p4/xON2DuOslbG5Zk/uS93y17DQenWABv2 5IZnu048bo6mDYyy2Nvn58u2m8nk5fH7yqJg9+ff6GMXw5h0VqdN87dv7J/4WUjlYZmSFaMlovHY HkINDqYUri6TUQ+0wEORtuBGfLC++88cmjciV/wZWpsZLJEK46PHiVHMna/bnEy5PTB4opX3AMnJ p8GvGrpNR9Cyoka20i24WDX7ewaoKjSGCKHbT7J9APxxgYzOY7zfSsdWwm0O8dAWMuLbD2gQmtz0 1mcnPMZDue/uzpH7izMQtn0/Wi1JCwjAsJpJ2OitoY1ua+m5lL1NJYGMO4GXVomknA+9RwU/vq From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Apr 2022 16:15:15 +0800 X-OQ-MSGID: <20220412081522.43246-3-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220412081522.43246-1-quinkblack@foxmail.com> References: <20220412081522.43246-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/10] avformat/hls: extract free_playlist method X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavformat/hls.c | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index e249810bce..ecb6237d2e 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -253,30 +253,35 @@ static void free_init_section_list(struct playlist *pls) pls->n_init_sections = 0; } +static void free_playlist(HLSContext *c, struct playlist *pls) +{ + free_segment_list(pls); + free_init_section_list(pls); + av_freep(&pls->main_streams); + av_freep(&pls->renditions); + av_freep(&pls->id3_buf); + av_dict_free(&pls->id3_initial); + ff_id3v2_free_extra_meta(&pls->id3_deferred_extra); + av_freep(&pls->init_sec_buf); + av_packet_free(&pls->pkt); + av_freep(&pls->pb.pub.buffer); + ff_format_io_close(c->ctx, &pls->input); + pls->input_read_done = 0; + ff_format_io_close(c->ctx, &pls->input_next); + pls->input_next_requested = 0; + if (pls->ctx) { + pls->ctx->pb = NULL; + avformat_close_input(&pls->ctx); + } + av_free(pls); +} + static void free_playlist_list(HLSContext *c) { int i; for (i = 0; i < c->n_playlists; i++) { struct playlist *pls = c->playlists[i]; - free_segment_list(pls); - free_init_section_list(pls); - av_freep(&pls->main_streams); - av_freep(&pls->renditions); - av_freep(&pls->id3_buf); - av_dict_free(&pls->id3_initial); - ff_id3v2_free_extra_meta(&pls->id3_deferred_extra); - av_freep(&pls->init_sec_buf); - av_packet_free(&pls->pkt); - av_freep(&pls->pb.pub.buffer); - ff_format_io_close(c->ctx, &pls->input); - pls->input_read_done = 0; - ff_format_io_close(c->ctx, &pls->input_next); - pls->input_next_requested = 0; - if (pls->ctx) { - pls->ctx->pb = NULL; - avformat_close_input(&pls->ctx); - } - av_free(pls); + free_playlist(c, pls); } av_freep(&c->playlists); c->n_playlists = 0; -- 2.31.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".