diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-31 11:01:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-31 11:01:30 +0200 |
| commit | 95960027a59fe38ad01a1429b85f9b3aa8fa2432 (patch) | |
| tree | 590f2c7b65c2badc0632dc06b9819a9b0a575f07 | |
| parent | 38536e59275052b89755c6ee806642ce27055009 (diff) | |
| parent | 9696740af715e50ef7098272e56e154826caa332 (diff) | |
| download | ffmpeg-95960027a59fe38ad01a1429b85f9b3aa8fa2432.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
hls: Call avformat_find_stream_info() on the chained demuxers
Conflicts:
libavformat/hls.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/hls.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c index 2b39030837..8554b7e84f 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -576,6 +576,7 @@ static int hls_read_header(AVFormatContext *s) ret = avformat_open_input(&v->ctx, v->segments[0]->url, in_fmt, NULL); if (ret < 0) goto fail; + v->ctx->ctx_flags &= ~AVFMTCTX_NOHEADER; ret = avformat_find_stream_info(v->ctx, NULL); if (ret < 0) |