tree 339be58a225dfaf77fcae3f096e92f84e3b8ecd4
parent 24cd7c5df78c53c1d1a36b81fb130594e84b3f12
parent 4f07a3aa2c6b7356c28646692261aa9080605fcc
author Michael Niedermayer <michaelni@gmx.at> 1320283327 +0100
committer Michael Niedermayer <michaelni@gmx.at> 1320283422 +0100

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>