Commit 5468c1d0 authored by Lynne's avatar Lynne Committed by Carl Eugen Hoyos

celt_pvq_init: only build when CONFIG_OPUS_ENCODER is enabled

The entire function was defined away before.
parent 4a2c6516
......@@ -903,7 +903,7 @@ int av_cold ff_celt_pvq_init(CeltPVQ **pvq, int encode)
s->pvq_search = ppp_pvq_search_c;
s->quant_band = encode ? pvq_encode_band : pvq_decode_band;
if (ARCH_X86)
if (CONFIG_OPUS_ENCODER && ARCH_X86)
ff_celt_pvq_init_x86(s);
*pvq = s;
......
......@@ -53,7 +53,6 @@ OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp.o
OBJS-$(CONFIG_DCA_DECODER) += x86/dcadsp_init.o x86/synth_filter_init.o
OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc_init.o
OBJS-$(CONFIG_EXR_DECODER) += x86/exrdsp_init.o
OBJS-$(CONFIG_OPUS_DECODER) += x86/celt_pvq_init.o
OBJS-$(CONFIG_OPUS_ENCODER) += x86/celt_pvq_init.o
OBJS-$(CONFIG_HEVC_DECODER) += x86/hevcdsp_init.o
OBJS-$(CONFIG_JPEG2000_DECODER) += x86/jpeg2000dsp_init.o
......
......@@ -32,7 +32,6 @@ av_cold void ff_celt_pvq_init_x86(CeltPVQ *s)
{
int cpu_flags = av_get_cpu_flags();
#if CONFIG_OPUS_ENCODER
if (EXTERNAL_SSE2(cpu_flags))
s->pvq_search = ff_pvq_search_approx_sse2;
......@@ -41,5 +40,4 @@ av_cold void ff_celt_pvq_init_x86(CeltPVQ *s)
if (EXTERNAL_AVX_FAST(cpu_flags))
s->pvq_search = ff_pvq_search_exact_avx;
#endif
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment