Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Jul 2013 11:37:40 +0000 (13:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Jul 2013 11:37:40 +0000 (13:37 +0200)
commita8e5fac1fb3fddeea829648139aa345af9cdc16c
tree46a212be2aa790088f37b483ebe5096e8f729b2d
parentccb422a69728ac739b20ba2c67d49d265fd20fdb
parentdc79685195a45c9b8b17d7b93d118e0aefa45462
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  indeo: Bound-check before applying transform

Conflicts:
libavcodec/indeo4.c
libavcodec/indeo5.c
libavcodec/ivi_common.c

See: af388237093ed6df6f5118b34ef938a2ca2ffbda0846719dd11ab3f7a7caee13e7af71f71d913389
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/indeo4.c
libavcodec/indeo5.c
libavcodec/ivi_common.c
libavcodec/ivi_common.h