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)
commit95960027a59fe38ad01a1429b85f9b3aa8fa2432
tree590f2c7b65c2badc0632dc06b9819a9b0a575f07
parent38536e59275052b89755c6ee806642ce27055009
parent9696740af715e50ef7098272e56e154826caa332
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>
libavformat/hls.c