[FFmpeg-cvslog] avformat/hlsenc: check hls segment mode for ignore the init filename

Steven Liu git at videolan.org
Thu Nov 2 16:30:50 EET 2017


ffmpeg | branch: master | Steven Liu <lq at chinaffmpeg.org> | Thu Nov  2 22:29:28 2017 +0800| [c52beb4839e030a15b68919b822cb25ad553b9bc] | committer: Steven Liu

avformat/hlsenc: check hls segment mode for ignore the init filename

ignore the fmp4_init_filename when in normal hls segment mode

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

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

 libavformat/hlsenc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 0ea93480a5..6d573db094 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -1443,6 +1443,7 @@ static int hls_write_header(AVFormatContext *s)
         }
     }
 
+    if (hls->segment_type == SEGMENT_TYPE_FMP4) {
     if (av_strcasecmp(hls->fmp4_init_filename, "init.mp4")) {
         hls->base_output_dirname = av_malloc(fmp4_init_filename_len);
         if (!hls->base_output_dirname) {
@@ -1472,6 +1473,7 @@ static int hls_write_header(AVFormatContext *s)
             av_strlcpy(hls->base_output_dirname, hls->fmp4_init_filename, fmp4_init_filename_len);
         }
     }
+    }
 
     if (!hls->use_localtime) {
         ret = sls_flag_check_duration_size_index(hls);



More information about the ffmpeg-cvslog mailing list