* commit '0cb83c56':
  indeo4: Check the block size if reusing the band configuration

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