]> git.sesse.net Git - ffmpeg/commitdiff
avformat/hlsenc: check hls segment mode for ignore the init filename
authorSteven Liu <lq@chinaffmpeg.org>
Thu, 2 Nov 2017 14:29:28 +0000 (22:29 +0800)
committerSteven Liu <lq@chinaffmpeg.org>
Thu, 2 Nov 2017 14:29:28 +0000 (22:29 +0800)
ignore the fmp4_init_filename when in normal hls segment mode

Signed-off-by: Steven Liu <lq@onvideo.cn>
libavformat/hlsenc.c

index 0ea93480a5bb62afc74b34917c66447a80faaf7a..6d573db094ca93a4e8ac511fbed0b3c9d9937d99 100644 (file)
@@ -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);