* commit '7b1fbd47':
  indeo2: check decoding errors.
  indeo2: return meaningful error codes
  rl2: cosmetics, reformat

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