From 77c23704c769168e4210956314775a1931f6aa0b Mon Sep 17 00:00:00 2001 From: Derek Buitenhuis Date: Wed, 8 Feb 2017 14:42:16 +0000 Subject: [PATCH] avcodec: Mark some codecs with threadsafe init as such Signed-off-by: Derek Buitenhuis Signed-off-by: Luca Barbato --- libavcodec/aasc.c | 1 + libavcodec/aic.c | 1 + libavcodec/anm.c | 1 + libavcodec/ansi.c | 1 + libavcodec/aura.c | 1 + libavcodec/avs.c | 1 + libavcodec/bethsoftvideo.c | 1 + libavcodec/bfi.c | 1 + libavcodec/bmvvideo.c | 1 + libavcodec/c93.c | 1 + libavcodec/cllc.c | 1 + libavcodec/cyuv.c | 2 ++ libavcodec/fraps.c | 1 + libavcodec/lcldec.c | 2 ++ libavcodec/pngdec.c | 1 + libavcodec/r210dec.c | 2 ++ libavcodec/utvideodec.c | 1 + libavcodec/vble.c | 1 + libavcodec/zerocodec.c | 1 + 19 files changed, 22 insertions(+) diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c index e65ea397b8..c4800f0906 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -119,4 +119,5 @@ AVCodec ff_aasc_decoder = { .close = aasc_decode_end, .decode = aasc_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/aic.c b/libavcodec/aic.c index ed0be44629..de9d7de91b 100644 --- a/libavcodec/aic.c +++ b/libavcodec/aic.c @@ -488,4 +488,5 @@ AVCodec ff_aic_decoder = { .decode = aic_decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, .init_thread_copy = ONLY_IF_THREADS_ENABLED(aic_decode_init), + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/anm.c b/libavcodec/anm.c index b70d220c9a..af8d843f6f 100644 --- a/libavcodec/anm.c +++ b/libavcodec/anm.c @@ -199,4 +199,5 @@ AVCodec ff_anm_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c index 65e2e16fae..0bdbdbe071 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -451,4 +451,5 @@ AVCodec ff_ansi_decoder = { .close = decode_close, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/aura.c b/libavcodec/aura.c index a1ef6f8d10..6a03f8f572 100644 --- a/libavcodec/aura.c +++ b/libavcodec/aura.c @@ -107,4 +107,5 @@ AVCodec ff_aura2_decoder = { .init = aura_decode_init, .decode = aura_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/avs.c b/libavcodec/avs.c index 959f570b38..edd91efbbd 100644 --- a/libavcodec/avs.c +++ b/libavcodec/avs.c @@ -186,4 +186,5 @@ AVCodec ff_avs_decoder = { .decode = avs_decode_frame, .close = avs_decode_end, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c index 11e2cfaab2..61f098bc09 100644 --- a/libavcodec/bethsoftvideo.c +++ b/libavcodec/bethsoftvideo.c @@ -164,4 +164,5 @@ AVCodec ff_bethsoftvid_decoder = { .close = bethsoftvid_decode_end, .decode = bethsoftvid_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/bfi.c b/libavcodec/bfi.c index 8335e9d125..0ce73b1754 100644 --- a/libavcodec/bfi.c +++ b/libavcodec/bfi.c @@ -181,4 +181,5 @@ AVCodec ff_bfi_decoder = { .close = bfi_decode_close, .decode = bfi_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/bmvvideo.c b/libavcodec/bmvvideo.c index 4fb42f0f5c..698bc56871 100644 --- a/libavcodec/bmvvideo.c +++ b/libavcodec/bmvvideo.c @@ -289,4 +289,5 @@ AVCodec ff_bmv_video_decoder = { .init = decode_init, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/c93.c b/libavcodec/c93.c index 18df9586d0..e75148328e 100644 --- a/libavcodec/c93.c +++ b/libavcodec/c93.c @@ -261,4 +261,5 @@ AVCodec ff_c93_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/cllc.c b/libavcodec/cllc.c index bac2b730e1..3c476f71f0 100644 --- a/libavcodec/cllc.c +++ b/libavcodec/cllc.c @@ -488,4 +488,5 @@ AVCodec ff_cllc_decoder = { .decode = cllc_decode_frame, .close = cllc_decode_close, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c index 86f7aacb65..2c4f98d3f9 100644 --- a/libavcodec/cyuv.c +++ b/libavcodec/cyuv.c @@ -173,6 +173,7 @@ AVCodec ff_aura_decoder = { .init = cyuv_decode_init, .decode = cyuv_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -186,5 +187,6 @@ AVCodec ff_cyuv_decoder = { .init = cyuv_decode_init, .decode = cyuv_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c index fd1dcb7b4a..4620ec10db 100644 --- a/libavcodec/fraps.c +++ b/libavcodec/fraps.c @@ -383,4 +383,5 @@ AVCodec ff_fraps_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index ba608f908d..dffc20a811 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -617,6 +617,7 @@ AVCodec ff_mszh_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -631,5 +632,6 @@ AVCodec ff_zlib_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index d59409764d..927248f2e3 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -708,4 +708,5 @@ AVCodec ff_png_decoder = { .close = png_dec_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1 /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/r210dec.c b/libavcodec/r210dec.c index f168fd3bfd..cfe548465d 100644 --- a/libavcodec/r210dec.c +++ b/libavcodec/r210dec.c @@ -90,6 +90,7 @@ AVCodec ff_r210_decoder = { .init = decode_init, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif #if CONFIG_R10K_DECODER @@ -101,5 +102,6 @@ AVCodec ff_r10k_decoder = { .init = decode_init, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index 1f5b02f560..381b4f7403 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -564,4 +564,5 @@ AVCodec ff_utvideo_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/vble.c b/libavcodec/vble.c index 75db27ff09..c3451cb9ed 100644 --- a/libavcodec/vble.c +++ b/libavcodec/vble.c @@ -208,4 +208,5 @@ AVCodec ff_vble_decoder = { .close = vble_decode_close, .decode = vble_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; diff --git a/libavcodec/zerocodec.c b/libavcodec/zerocodec.c index 1419e84a34..4448e85f4b 100644 --- a/libavcodec/zerocodec.c +++ b/libavcodec/zerocodec.c @@ -151,4 +151,5 @@ AVCodec ff_zerocodec_decoder = { .decode = zerocodec_decode_frame, .close = zerocodec_decode_close, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, };