diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 20:12:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 20:14:50 +0200 |
| commit | 67979b593699ea02ba1b9c60db53e15dcd5fbc1c (patch) | |
| tree | b4babc1e58fcb19a5a3ee90a5d1e9e27ddd288e8 /libavformat | |
| parent | f21f969a3f2a47df7099a03729b56d45fc6d084b (diff) | |
| parent | 87a3ea3192bf5e4aafa08bca8686a2b577eae818 (diff) | |
| download | ffmpeg-67979b593699ea02ba1b9c60db53e15dcd5fbc1c.tar.gz | |
Merge commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818'
* commit '87a3ea3192bf5e4aafa08bca8686a2b577eae818':
segment: Report the current media sequence
Conflicts:
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/segment.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/segment.c b/libavformat/segment.c index c8dcf62dc2..ae27a958f5 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -246,6 +246,9 @@ static int segment_list_open(AVFormatContext *s) avio_printf(seg->list_pb, "#EXT-X-ALLOW-CACHE:%s\n", seg->list_flags & SEGMENT_LIST_FLAG_CACHE ? "YES" : "NO"); + av_log(s, AV_LOG_VERBOSE, "EXT-X-MEDIA-SEQUENCE:%d\n", + seg->segment_list_entries->index); + for (entry = seg->segment_list_entries; entry; entry = entry->next) max_duration = FFMAX(max_duration, entry->end_time - entry->start_time); avio_printf(seg->list_pb, "#EXT-X-TARGETDURATION:%"PRId64"\n", (int64_t)ceil(max_duration)); |