Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jan 2013 17:25:53 +0000 (18:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jan 2013 17:25:57 +0000 (18:25 +0100)
commit8b8ac78ef3a1e4934652665357905ea915a2d97f
tree43382b17c8faba000a2a1e8908b4453831ceb1c8
parent1e7a92f219a8e245128773491346d64c1e6c85fa
parentcf29f49d8ae00bb153c24b5c8a8f6cb150a91de8
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpenc: fix overflow checking in avc_mp4_find_startcode()
  rtmp: fix buffer overflows in ff_amf_tag_contents()
  rtmp: fix multiple broken overflow checks
  float_dsp: Include config.h for redefining restrict

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/float_dsp.h