diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 14:04:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-29 14:04:27 +0200 |
| commit | d31c0fcfa55a841bc47d44bedd407b2c623f939a (patch) | |
| tree | 1053c826a19edcd6eff11f4f7db8d55cf8e113ab /libavformat/hls.c | |
| parent | 07440c938073c6c83b8b3592dfade690bab9c19e (diff) | |
| parent | cdd2d73d315ecaf19ff49e64c91923275f1bda68 (diff) | |
| download | ffmpeg-d31c0fcfa55a841bc47d44bedd407b2c623f939a.tar.gz | |
Merge commit 'cdd2d73d315ecaf19ff49e64c91923275f1bda68'
* commit 'cdd2d73d315ecaf19ff49e64c91923275f1bda68':
hls: Don't check discard flags until the parent demuxer's streams actually exist
hls: Copy the time base from the chained demuxer
Conflicts:
libavformat/hls.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hls.c')
| -rw-r--r-- | libavformat/hls.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c index 95dd1c36bc..c3d83defa8 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -458,7 +458,8 @@ reload: c->end_of_segment = 1; c->cur_seq_no = v->cur_seq_no; - if (v->ctx && v->ctx->nb_streams && v->parent->nb_streams >= v->stream_offset + v->ctx->nb_streams) { + if (v->ctx && v->ctx->nb_streams && + v->parent->nb_streams >= v->stream_offset + v->ctx->nb_streams) { v->needed = 0; for (i = v->stream_offset; i < v->stream_offset + v->ctx->nb_streams; i++) { |