[FFmpeg-cvslog] Merge commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 13 10:19:15 2013 +0200| [d3850ac5b9c7e0f6cd77d652a3a8985c6ca6732a] | committer: Michael Niedermayer

Merge commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0'

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

Conflicts:
	libavcodec/indeo4.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d3850ac5b9c7e0f6cd77d652a3a8985c6ca6732a
---