[FFmpeg-cvslog] avformat/hlsenc: move free fmp4_init_filename after hls_window operation

Steven Liu git at videolan.org
Tue Aug 22 05:22:54 EEST 2017


ffmpeg | branch: master | Steven Liu <lq at chinaffmpeg.org> | Tue Aug 22 10:21:42 2017 +0800| [20a6b198b4849a5934736ac43517d24a70d20840] | committer: Steven Liu

avformat/hlsenc: move free fmp4_init_filename after hls_window operation

fix ticket id: 6599

Signed-off-by: Steven Liu <lq at onvideo.cn>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20a6b198b4849a5934736ac43517d24a70d20840
---

 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);



More information about the ffmpeg-cvslog mailing list