RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '344f7b5a7e0d50573dec402dfe6228676f3889d9' 

* commit '344f7b5a7e0d50573dec402dfe6228676f3889d9':
  hls: Report the current media sequence

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-30 20:02:42 +02:00
parent 0eb9482e32 344f7b5a7e
commit f21f969a3f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/hlsenc.c
View File

@ -148,6 +148,9 @@ static int hls_window(AVFormatContext *s, int last)
avio_printf(hls->pb, "#EXT-X-MEDIA-SEQUENCE:%"PRId64"\n", avio_printf(hls->pb, "#EXT-X-MEDIA-SEQUENCE:%"PRId64"\n",
FFMAX(0, hls->sequence - hls->nb_entries)); FFMAX(0, hls->sequence - hls->nb_entries));
av_log(s, AV_LOG_VERBOSE, "EXT-X-MEDIA-SEQUENCE:%"PRId64"\n",
FFMAX(0, hls->sequence - hls->size));
for (en = hls->list; en; en = en->next) { for (en = hls->list; en; en = en->next) {
avio_printf(hls->pb, "#EXTINF:%f,\n", en->duration); avio_printf(hls->pb, "#EXTINF:%f,\n", en->duration);
if (hls->baseurl) if (hls->baseurl)