Michael Niedermayer fa4bb7c5b2 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>

2015-03-13 22:48:54 +01:00

5.7 KiB

Raw Blame History

View Raw