[FFmpeg-cvslog] Merge commit '5a0e953c2465be9d449d5f523c3d3e2b886910b2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 13 22:48:54 2015 +0100| [fa4bb7c5b249da60cd16113b795a64f0055ef164] | committer: Michael Niedermayer

Merge commit '5a0e953c2465be9d449d5f523c3d3e2b886910b2'

* commit '5a0e953c2465be9d449d5f523c3d3e2b886910b2':
  mjpeg: Mark decoder family as thread safe

Conflicts:
	libavcodec/mjpegbdec.c
	libavcodec/mjpegdec.c
	libavcodec/mxpegdec.c
	libavcodec/sp5xdec.c

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

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