Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 31 Jul 2013 09:01:30 +0000 (11:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 31 Jul 2013 09:01:30 +0000 (11:01 +0200)
* qatar/master:
  hls: Call avformat_find_stream_info() on the chained demuxers

Conflicts:
libavformat/hls.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/hls.c

index 2b39030..8554b7e 100644 (file)
@@ -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)