[SCM] libav/experimental: hls: Factor the sequence computation
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:03:01 UTC 2014
The following commit has been merged in the experimental branch:
commit a16431034d9bd44182bf844d6bbde2c98bc4e6b5
Author: Luca Barbato <lu_zero at gentoo.org>
Date: Tue Apr 29 18:37:01 2014 +0200
hls: Factor the sequence computation
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index dc51e7e..79820f0 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -132,6 +132,7 @@ static int hls_window(AVFormatContext *s, int last)
ListEntry *en;
int target_duration = 0;
int ret = 0;
+ int64_t sequence = FFMAX(hls->start_sequence, hls->sequence - hls->size);
if ((ret = avio_open2(&hls->pb, s->filename, AVIO_FLAG_WRITE,
&s->interrupt_callback, NULL)) < 0)
@@ -145,11 +146,10 @@ static int hls_window(AVFormatContext *s, int last)
avio_printf(hls->pb, "#EXTM3U\n");
avio_printf(hls->pb, "#EXT-X-VERSION:3\n");
avio_printf(hls->pb, "#EXT-X-TARGETDURATION:%d\n", target_duration);
- avio_printf(hls->pb, "#EXT-X-MEDIA-SEQUENCE:%"PRId64"\n",
- FFMAX(hls->start_sequence, hls->sequence - hls->size));
+ avio_printf(hls->pb, "#EXT-X-MEDIA-SEQUENCE:%"PRId64"\n", sequence);
av_log(s, AV_LOG_VERBOSE, "EXT-X-MEDIA-SEQUENCE:%"PRId64"\n",
- FFMAX(hls->start_sequence, hls->sequence - hls->size));
+ sequence);
for (en = hls->list; en; en = en->next) {
avio_printf(hls->pb, "#EXTINF:%d,\n", en->duration);
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list