[FFmpeg-devel] [PATCH] avformat/hlsenc: remove duplicate code block

[Steven Liu]

Signed-off-by: Steven Liu <lq at chinaffmpeg.org>
---
 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);
-- 
2.15.1