From cdd2d73d315ecaf19ff49e64c91923275f1bda68 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 13 Aug 2012 20:37:04 +0200 Subject: hls: Don't check discard flags until the parent demuxer's streams actually exist MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If passing the end of one segment while initializing the chained demuxer, the parent demuxer's streams aren't set up yet, so we can't recheck the discard flags. Signed-off-by: Martin Storsjö --- libavformat/hls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavformat/hls.c') diff --git a/libavformat/hls.c b/libavformat/hls.c index b9b1feaf3d..213b71764b 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -427,7 +427,8 @@ reload: c->end_of_segment = 1; c->cur_seq_no = v->cur_seq_no; - if (v->ctx && 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++) { -- cgit v1.2.3