[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/release/0.5' into release/0.5

[Michael Niedermayer]

ffmpeg | branch: release/0.5 | Michael Niedermayer <michaelni at gmx.at> | Thu Nov  3 02:22:07 2011 +0100| [e9210b4e174c75a7c1c9248a700eae8ac9a5a1b9] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e9210b4e174c75a7c1c9248a700eae8ac9a5a1b9
---