diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 21:29:04 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 21:29:04 +0200 |
commit | 554a1ecab7efbdaf10ab459d73152bfb6e355dfa (patch) | |
tree | 5acd189ee221e94ac72514755b45c3c0e0e3eb07 /libavformat | |
parent | 5b4c8aac97863b4830717db6cb2cd4e3093f9a88 (diff) | |
parent | 7266e24f176389d2e81bfc7c829934f7c8ae361c (diff) | |
download | ffmpeg-streaming-554a1ecab7efbdaf10ab459d73152bfb6e355dfa.zip ffmpeg-streaming-554a1ecab7efbdaf10ab459d73152bfb6e355dfa.tar.gz |
Merge commit '7266e24f176389d2e81bfc7c829934f7c8ae361c'
* commit '7266e24f176389d2e81bfc7c829934f7c8ae361c':
hls: Sync the file number with the start sequence
Conflicts:
libavformat/hlsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/hlsenc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 0b9d8e5..12bd07b 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -174,7 +174,7 @@ static int hls_start(AVFormatContext *s) int err = 0; if (av_get_frame_filename(oc->filename, sizeof(oc->filename), - c->basename, c->wrap ? c->number % c->wrap : c->number) < 0) { + c->basename, c->wrap ? c->sequence % c->wrap : c->sequence) < 0) { av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s'\n", c->basename); return AVERROR(EINVAL); } @@ -198,9 +198,6 @@ static int hls_write_header(AVFormatContext *s) const char *pattern = "%d.ts"; int basename_size = strlen(s->filename) + strlen(pattern) + 1; - hls->number = 0; - - hls->sequence = hls->start_sequence; hls->recording_time = hls->time * AV_TIME_BASE; hls->start_pts = AV_NOPTS_VALUE; |