[FFmpeg-cvslog] Merge commit '7bcaeb408e3eb2d2f37a306009fa7fe7eb0f1d79'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 26 15:42:29 2013 +0100| [8380fc88845ef92e16d54df582519284062b199d] | committer: Michael Niedermayer

Merge commit '7bcaeb408e3eb2d2f37a306009fa7fe7eb0f1d79'

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

Conflicts:
	libavcodec/mjpegdec.c
	libavcodec/rawdec.c

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

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