Merge remote-tracking branch 'qatar/release/0.5' into release/0.5
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Nov 2011 01:22:07 +0000 (02:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Nov 2011 01:23:42 +0000 (02:23 +0100)
* qatar/release/0.5:
  Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080.
  cavs: fix some crashes with invalid bitstreams
  mjpeg: Detect overreads in mjpeg_decode_scan() and error out.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge