diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 22:48:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 22:48:54 +0100 |
| commit | fa4bb7c5b249da60cd16113b795a64f0055ef164 (patch) | |
| tree | daf587eadb241ae7b59bcf2558834baa75815daa /libavdevice/v4l.c | |
| parent | a048bd44b2563dc453e0c97bdca60cf028feaf50 (diff) | |
| parent | 5a0e953c2465be9d449d5f523c3d3e2b886910b2 (diff) | |
| download | ffmpeg-fa4bb7c5b249da60cd16113b795a64f0055ef164.tar.gz | |
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>
Diffstat (limited to 'libavdevice/v4l.c')
0 files changed, 0 insertions, 0 deletions