diff mbox

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

Message ID 20170820131912.75663-1-lq@chinaffmpeg.org
State Accepted
Commit 20a6b198b4849a5934736ac43517d24a70d20840
Headers show

Commit Message

Liu Steven Aug. 20, 2017, 1:19 p.m. UTC 
fix ticket id: 6599

Signed-off-by: Steven Liu <lq@onvideo.cn>
---
 libavformat/hlsenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Steven Liu Aug. 22, 2017, 2:23 a.m. UTC | #1 
2017-08-20 21:19 GMT+08:00 Steven Liu <lq@chinaffmpeg.org>:
> fix ticket id: 6599
>
> Signed-off-by: Steven Liu <lq@onvideo.cn>
> ---
>  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);
> --
> 2.11.0 (Apple Git-81)
>
>
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

pushed
diff mbox

Patch

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