Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Nov 2013 17:15:09 +0000 (18:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Nov 2013 17:15:12 +0000 (18:15 +0100)
* qatar/master:
  hls: Avoid reading outside of the allocated array

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

Simple merge