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/mjpegdec.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 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 5e86c2ecd7..a0548c18a0 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2364,6 +2364,7 @@ AVCodec ff_mjpeg_decoder = { .capabilities = CODEC_CAP_DR1, .max_lowres = 3, .priv_class = &mjpegdec_class, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_THP_DECODER @@ -2379,5 +2380,6 @@ AVCodec ff_thp_decoder = { .flush = decode_flush, .capabilities = CODEC_CAP_DR1, .max_lowres = 3, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif |