* commit '7bcaeb40':
  mjpegdec: fix indentation
  rawdec: cosmetics, reformat
  mimic: return meaningful error codes.

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