Merge commit '7bcaeb408e3eb2d2f37a306009fa7fe7eb0f1d79'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jan 2013 14:42:29 +0000 (15:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jan 2013 14:42:29 +0000 (15:42 +0100)
commit8380fc88845ef92e16d54df582519284062b199d
tree0e1b6bec69063c05fce5b457a903be6e9577bda0
parent8ab97a60ef949f9f2cc0de768143c3ce89a1aabf
parent7bcaeb408e3eb2d2f37a306009fa7fe7eb0f1d79
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@gmx.at>
libavcodec/mimic.c
libavcodec/mjpegdec.c
libavcodec/rawdec.c