Merge commit '488f87be873506abb01d67708a67c10a4dd29283'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Feb 2013 10:26:53 +0000 (11:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Feb 2013 10:26:53 +0000 (11:26 +0100)
* 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@gmx.at>
1  2 
libavcodec/qdm2.c
libavcodec/roqvideodec.c
libavcodec/vqavideo.c

Simple merge
Simple merge
Simple merge