***********************************/
#include "libavutil/libm.h"
-#include "libavutil/thread.h"
#include "libavutil/float_dsp.h"
#include "libavutil/opt.h"
#include "avcodec.h"
#include "psymodel.h"
-static AVOnce aac_table_init = AV_ONCE_INIT;
-
static void put_pce(PutBitContext *pb, AVCodecContext *avctx)
{
int i, j;
align_put_bits(pb);
put_bits(pb, 8, strlen(aux_data));
- avpriv_put_string(pb, aux_data, 0);
+ ff_put_string(pb, aux_data, 0);
}
/**
return 0;
}
-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;
if (HAVE_MIPSDSP)
ff_aac_coder_init_mips(s);
- if ((ret = ff_thread_once(&aac_table_init, &aac_encode_init_tables)) != 0)
- return AVERROR_UNKNOWN;
-
ff_af_queue_init(avctx, &s->afq);
+ ff_aac_tableinit();
return 0;
}