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)
commit96008082dbd3a2475ad429b02bf73ba20b4ea9bf
tree6f441d4c7afbdb359c98dac5d5420ab5f9be4764
parentc63f9fb37a7b7da03bed6d79115f7f2e36607808
parent488f87be873506abb01d67708a67c10a4dd29283
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@gmx.at>
libavcodec/qdm2.c
libavcodec/roqvideodec.c
libavcodec/vqavideo.c