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 | |
| 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')
| -rw-r--r-- | libavcodec/jpeglsdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/mjpegbdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/mjpegdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/mxpegdec.c | 1 | ||||
| -rw-r--r-- | libavcodec/sp5xdec.c | 3 |
5 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index bb8c264ae0..e85f511d71 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, }; diff --git a/libavcodec/mjpegbdec.c b/libavcodec/mjpegbdec.c index f6ee7057fd..8ac60c22a1 100644 --- a/libavcodec/mjpegbdec.c +++ b/libavcodec/mjpegbdec.c @@ -27,6 +27,7 @@ #include <inttypes.h> #include "avcodec.h" +#include "internal.h" #include "mjpeg.h" #include "mjpegdec.h" @@ -167,4 +168,5 @@ AVCodec ff_mjpegb_decoder = { .decode = mjpegb_decode_frame, .capabilities = CODEC_CAP_DR1, .max_lowres = 3, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; 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 diff --git a/libavcodec/mxpegdec.c b/libavcodec/mxpegdec.c index fbd4767db8..05c74eed2b 100644 --- a/libavcodec/mxpegdec.c +++ b/libavcodec/mxpegdec.c @@ -345,4 +345,5 @@ AVCodec ff_mxpeg_decoder = { .decode = mxpeg_decode_frame, .capabilities = CODEC_CAP_DR1, .max_lowres = 3, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c index 7496198420..3e49c59e06 100644 --- a/libavcodec/sp5xdec.c +++ b/libavcodec/sp5xdec.c @@ -25,6 +25,7 @@ */ #include "avcodec.h" +#include "internal.h" #include "mjpeg.h" #include "mjpegdec.h" #include "sp5x.h" @@ -105,6 +106,7 @@ AVCodec ff_sp5x_decoder = { .decode = sp5x_decode_frame, .capabilities = CODEC_CAP_DR1, .max_lowres = 3, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_AMV_DECODER @@ -118,5 +120,6 @@ AVCodec ff_amv_decoder = { .close = ff_mjpeg_decode_end, .decode = sp5x_decode_frame, .max_lowres = 3, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif |