]> git.sesse.net Git - ffmpeg/commitdiff
avformat/hlsenc: add warn message when use both fmp4 and single_file
authorSteven Liu <lq@chinaffmpeg.org>
Fri, 7 Jul 2017 02:05:54 +0000 (10:05 +0800)
committerSteven Liu <lq@chinaffmpeg.org>
Fri, 7 Jul 2017 02:05:54 +0000 (10:05 +0800)
have not implementation the fmp4 single file yet before this commit.

Suggested-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Steven Liu <lq@onvideo.cn>
libavformat/hlsenc.c

index dd6a62b13cb74b2eae0e297c56fad03b22d85b7c..d93ca844e4969ca35f884855c60014d7d7339f10 100644 (file)
@@ -1304,9 +1304,14 @@ static int hls_write_header(AVFormatContext *s)
     const char *pattern_localtime_fmt = get_default_pattern_localtime_fmt();
     const char *vtt_pattern = "%d.vtt";
     AVDictionary *options = NULL;
+    int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0);
     int basename_size;
     int vtt_basename_size;
 
+    if (hls->segment_type == SEGMENT_TYPE_FMP4 && byterange_mode) {
+        av_log(s, AV_LOG_WARNING, "Have not support fmp4 byterange mode yet now\n");
+        return AVERROR_PATCHWELCOME;
+    }
     if ((hls->start_sequence_source_type == HLS_START_SEQUENCE_AS_SECONDS_SINCE_EPOCH) ||
         (hls->start_sequence_source_type == HLS_START_SEQUENCE_AS_FORMATTED_DATETIME)) {
         time_t t = time(NULL); // we will need it in either case