* commit '5ec6d152':
  indeo4: B-frames decoding

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