Merge commit '6a10142faa1cca8ba2bfe51b970754f62d60f320'
* commit '6a10142faa1cca8ba2bfe51b970754f62d60f320':
indeo: reject negative array indexes
Conflicts:
libavcodec/ivi_common.c
See: 93927eb334
, a93c7ca6ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>