diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-10-14 14:25:51 -0400 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-10-15 13:48:55 -0400 |
commit | 1a29804558c13ef512d9ef73a9b0d782af4fa5f2 (patch) | |
tree | bbc35b549488b63341790dd82b54fd1e7fc3f31f /libavcodec/aacdec.c | |
parent | 0861862b897ade9e62064f532f3b0a957ee7a0d8 (diff) | |
download | ffmpeg-1a29804558c13ef512d9ef73a9b0d782af4fa5f2.tar.gz |
aac: Make codec init run under ff_thread_once
This makes AAC init threadsafe.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/aacdec.c')
-rw-r--r-- | libavcodec/aacdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 837102f40a..f53803bd6d 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -551,6 +551,7 @@ AVCodec ff_aac_decoder = { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .capabilities = AV_CODEC_CAP_CHANNEL_CONF | AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .channel_layouts = aac_channel_layout, .flush = flush, .priv_class = &aac_decoder_class, @@ -575,6 +576,7 @@ AVCodec ff_aac_latm_decoder = { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .capabilities = AV_CODEC_CAP_CHANNEL_CONF | AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .channel_layouts = aac_channel_layout, .flush = flush, .profiles = profiles, |