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)
commite9210b4e174c75a7c1c9248a700eae8ac9a5a1b9
tree339be58a225dfaf77fcae3f096e92f84e3b8ecd4
parent24cd7c5df78c53c1d1a36b81fb130594e84b3f12
parent4f07a3aa2c6b7356c28646692261aa9080605fcc
Merge remote-tracking branch 'qatar/release/0.5' into release/0.5

* 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>