Merge commit '28dda8a691f1c723a4a9365ab85f9625f1330096'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Jul 2013 11:24:58 +0000 (13:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Jul 2013 11:45:36 +0000 (13:45 +0200)
* commit '28dda8a691f1c723a4a9365ab85f9625f1330096':
  indeo: Sanitize ff_ivi_init_planes fail paths

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

Simple merge
Simple merge
Simple merge