[FFmpeg-cvslog] Merge commit '488f87be873506abb01d67708a67c10a4dd29283'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 18 11:26:53 2013 +0100| [96008082dbd3a2475ad429b02bf73ba20b4ea9bf] | committer: Michael Niedermayer

Merge commit '488f87be873506abb01d67708a67c10a4dd29283'

* commit '488f87be873506abb01d67708a67c10a4dd29283':
  roqvideodec: check dimensions validity
  vqavideo: check chunk sizes before reading chunks
  qdm2: check array index before use, fix out of array accesses

Conflicts:
	libavcodec/qdm2.c
	libavcodec/roqvideodec.c
	libavcodec/vqavideo.c

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

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