Merge commit '6a10142faa1cca8ba2bfe51b970754f62d60f320'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Jul 2013 10:23:13 +0000 (12:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Jul 2013 10:26:25 +0000 (12:26 +0200)
commit9f89bebb7bffc3c2f3c7b0b80ab59a0b9d6d09b1
tree3c34ef29eb415aabf13986c20a3e57b096b135b9
parent7d3b55c6a427a33f44e3d512c5866eebe5df7915
parent6a10142faa1cca8ba2bfe51b970754f62d60f320
Merge commit '6a10142faa1cca8ba2bfe51b970754f62d60f320'

* commit '6a10142faa1cca8ba2bfe51b970754f62d60f320':
  indeo: reject negative array indexes

Conflicts:
libavcodec/ivi_common.c

See: 93927eb334dce961603645dd4ed9772bb2400cc4a93c7ca6ef625188c9ec088c2e75f731b78c9923

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ivi_common.c