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)
commit9c00f9ada690ff0446cb6299549964ff9436050b
tree63f2da18d289e5ccd9b2962d4c80417d80a36495
parent9440e4706793e71527fc1e0355e53ace0e227213
parent56c2337004d5223ae03d08020ad3eb4faa1bebc6
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hls: Avoid reading outside of the allocated array

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