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>
1  2 
libavformat/hls.c

Simple merge