Merge commit 'c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622'

* commit 'c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622':
  hls: Set stream offset before opening a chained demuxer

Conflicts:
	libavformat/hls.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/hls.c
index c3d83defa8d6e672328419d0e4e8da65c2d22d33,86cf9741daac04084155c90f70ce9c5720f7cc37..84bd8448a46b64d8b3d00530682c19d538acdc4e
--- 1/libavformat/hls.c
--- 2/libavformat/hls.c
+++ b/libavformat/hls.c
@@@ -572,13 -523,8 +572,12 @@@ static int hls_read_header(AVFormatCont
              goto fail;
          }
          v->ctx->pb       = &v->pb;
+         v->stream_offset = stream_offset;
          ret = avformat_open_input(&v->ctx, v->segments[0]->url, in_fmt, NULL);
- 
-         v->stream_offset = stream_offset;
 +        if (ret < 0)
 +            goto fail;
 +        v->ctx->ctx_flags &= ~AVFMTCTX_NOHEADER;
 +        ret = avformat_find_stream_info(v->ctx, NULL);
          if (ret < 0)
              goto fail;
          snprintf(bitrate_str, sizeof(bitrate_str), "%d", v->bandwidth);