Merge commit '5a0e953c2465be9d449d5f523c3d3e2b886910b2'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Mar 2015 21:48:54 +0000 (22:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Mar 2015 21:48:54 +0000 (22:48 +0100)
commitfa4bb7c5b249da60cd16113b795a64f0055ef164
treedaf587eadb241ae7b59bcf2558834baa75815daa
parenta048bd44b2563dc453e0c97bdca60cf028feaf50
parent5a0e953c2465be9d449d5f523c3d3e2b886910b2
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@gmx.at>
libavcodec/jpeglsdec.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mxpegdec.c
libavcodec/sp5xdec.c