]> git.sesse.net Git - ffmpeg/commitdiff
avformat/hlsenc: donnot show duplicate segment warning at byterange mode
authorSteven Liu <lq@chinaffmpeg.org>
Mon, 19 Jun 2017 02:35:41 +0000 (10:35 +0800)
committerSteven Liu <lq@chinaffmpeg.org>
Mon, 19 Jun 2017 02:35:41 +0000 (10:35 +0800)
When the hlsenc at BYTERANGE mode, it should not show the warning message:
"Duplicated segment filename detected:"

Reported-by: Marco <marco@worldcast.com>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
libavformat/hlsenc.c

index 7ed121a5ddfecd96832209921a26ce76ebf36478..40143c86aa27db397024ea58f71193fc42b4684a 100644 (file)
@@ -722,6 +722,7 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, double
 {
     HLSSegment *en = av_malloc(sizeof(*en));
     const char  *filename;
+    int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0);
     int ret;
 
     if (!en)
@@ -737,8 +738,8 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, double
     if (hls->use_localtime_mkdir) {
         filename = hls->avf->filename;
     }
-    if (find_segment_by_filename(hls->segments, filename)
-        || find_segment_by_filename(hls->old_segments, filename)) {
+    if ((find_segment_by_filename(hls->segments, filename) || find_segment_by_filename(hls->old_segments, filename))
+        && !byterange_mode) {
         av_log(hls, AV_LOG_WARNING, "Duplicated segment filename detected: %s\n", filename);
     }
     av_strlcpy(en->filename, filename, sizeof(en->filename));