Merge commit '28dda8a691f1c723a4a9365ab85f9625f1330096'

* commit '28dda8a691f1c723a4a9365ab85f9625f1330096':
  indeo: Sanitize ff_ivi_init_planes fail paths

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/indeo4.c
Simple merge

diff --cc libavcodec/indeo5.c
Simple merge

diff --cc libavcodec/ivi_common.c
Simple merge