aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-11-22 17:57:38 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-12-08 17:51:48 +0100
commit35f61eb3507ebb746cba1cc14ca8a280b9f258ed (patch)
treee382f94d53ba4fc840bed282903e1413a6f5dbe6
parent285db1d53b2df27a8cc4221222a1bb0bd6024a7d (diff)
downloadffmpeg-35f61eb3507ebb746cba1cc14ca8a280b9f258ed.tar.gz
avcodec/nellymoserdec: Make decoder init-threadsafe
Easy now that initializing the ff_sine_* tables is thread-safe. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
-rw-r--r--libavcodec/nellymoserdec.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c
index d667d9ce79..49a21b43ce 100644
--- a/libavcodec/nellymoserdec.c
+++ b/libavcodec/nellymoserdec.c
@@ -128,13 +128,12 @@ static av_cold int decode_init(AVCodecContext * avctx) {
s->scale_bias = 1.0/(32768*8);
avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
- /* Generate overlap window */
- if (!ff_sine_128[127])
- ff_init_ff_sine_windows(7);
-
avctx->channels = 1;
avctx->channel_layout = AV_CH_LAYOUT_MONO;
+ /* Generate overlap window */
+ ff_init_ff_sine_windows(7);
+
return 0;
}
@@ -198,4 +197,5 @@ AVCodec ff_nellymoser_decoder = {
.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_PARAM_CHANGE,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLT,
AV_SAMPLE_FMT_NONE },
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};