[FFmpeg-cvslog] avformat/hlsenc: add warning for append_list and hls_init_time option

Steven Liu git at videolan.org
Wed Aug 31 03:55:38 EEST 2016


ffmpeg | branch: master | Steven Liu <lingjiujianke at gmail.com> | Tue Aug 30 17:26:54 2016 +0800| [3aab6fa6baf8f5511a9dec5996a303e25716f185] | committer: Michael Niedermayer

avformat/hlsenc: add warning for append_list and hls_init_time option

When use append_list mode, the hls_init_time set nouse,
Because the append_list only support append at the old m3u8 end
cannot set init segments durations at the middle of the list.
That's invalid. and show a warning message for user.

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index ab4a9bf..81b7efa 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -812,6 +812,12 @@ static int hls_write_header(AVFormatContext *s)
 
     if (hls->flags & HLS_APPEND_LIST) {
         parse_playlist(s, s->filename);
+        if (hls->init_time > 0) {
+            av_log(s, AV_LOG_WARNING, "append_list mode does not support hls_init_time,"
+                   " hls_init_time value will have no effect\n");
+            hls->init_time = 0;
+            hls->recording_time = hls->time * AV_TIME_BASE;
+        }
     }
 
     if ((ret = hls_start(s)) < 0)



More information about the ffmpeg-cvslog mailing list