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)
* 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>
1  2 
libavutil/float_dsp.h

Simple merge