[FFmpeg-cvslog] Merge commit '7520d9779c6d30b385df5a0a42da508238076192'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 30 13:50:55 2013 +0200| [e3fb8ac9564b6a3d86c5f60c940f2056a4faae56] | committer: Michael Niedermayer

Merge commit '7520d9779c6d30b385df5a0a42da508238076192'

* commit '7520d9779c6d30b385df5a0a42da508238076192':
  mjpeg: Move code out of else branch

Conflicts:
	libavcodec/mjpegdec.c

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

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