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 /libavcodec/jpeglsdec.c | |
| parent | a048bd44b2563dc453e0c97bdca60cf028feaf50 (diff) | |
| parent | 5a0e953c2465be9d449d5f523c3d3e2b886910b2 (diff) | |
| download | ffmpeg-streaming-fa4bb7c5b249da60cd16113b795a64f0055ef164.zip ffmpeg-streaming-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 'libavcodec/jpeglsdec.c')
| -rw-r--r-- | libavcodec/jpeglsdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index bb8c264..e85f511 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -28,6 +28,7 @@ #include "avcodec.h" #include "get_bits.h" #include "golomb.h" +#include "internal.h" #include "mathops.h" #include "mjpeg.h" #include "mjpegdec.h" @@ -508,4 +509,5 @@ AVCodec ff_jpegls_decoder = { .close = ff_mjpeg_decode_end, .decode = ff_mjpeg_decode_frame, .capabilities = CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; |
