diff options
| author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2015-11-27 21:24:42 +0000 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2015-11-27 21:24:42 +0000 |
| commit | 6b407551588b4fc7fc9400bbdd131e692e6ae85e (patch) | |
| tree | 0c5012085011ef091e0418a990b2fb50765c1f1d /libavcodec | |
| parent | feb3f39614b88c113211a98dda1bc2fe5c3c6957 (diff) | |
| download | ffmpeg-6b407551588b4fc7fc9400bbdd131e692e6ae85e.tar.gz | |
aacenc: fix broken build with hardcoded tables
ff_aac_tableinit is a macro in the case of hardcoded tables, so wrap
that up in a function (similar to how the decoder template does it) and
use that as the argument for ff_thread_once().
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aacenc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index e49cf4b2c6..0bd8891ff2 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -888,6 +888,11 @@ alloc_fail: return AVERROR(ENOMEM); } +static av_cold void aac_encode_init_tables(void) +{ + ff_aac_tableinit(); +} + static av_cold int aac_encode_init(AVCodecContext *avctx) { AACEncContext *s = avctx->priv_data; @@ -989,7 +994,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) if (HAVE_MIPSDSPR1) ff_aac_coder_init_mips(s); - if ((ret = ff_thread_once(&aac_table_init, &ff_aac_tableinit)) != 0) + if ((ret = ff_thread_once(&aac_table_init, &aac_encode_init_tables)) != 0) return AVERROR_UNKNOWN; ff_af_queue_init(avctx, &s->afq); |