[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 31 11:01:30 2013 +0200| [95960027a59fe38ad01a1429b85f9b3aa8fa2432] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=95960027a59fe38ad01a1429b85f9b3aa8fa2432
---