eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-02 04:10:11 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
f275f9eaee9c69bcbc732002f0ee36f480eebb85
ffmpeg/libavcodec/mxpegdec.c
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

11 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink