Browse Source

celt_pvq_init: only build when CONFIG_OPUS_ENCODER is enabled

The entire function was defined away before.
tags/n4.2
Lynne Carl Eugen Hoyos 7 years ago
parent
commit
5468c1d075
3 changed files with 1 additions and 4 deletions
  1. +1
    -1
      libavcodec/opus_pvq.c
  2. +0
    -1
      libavcodec/x86/Makefile
  3. +0
    -2
      libavcodec/x86/celt_pvq_init.c

+ 1
- 1
libavcodec/opus_pvq.c View File

@@ -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;


+ 0
- 1
libavcodec/x86/Makefile View File

@@ -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


+ 0
- 2
libavcodec/x86/celt_pvq_init.c View File

@@ -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
}

Loading…
Cancel
Save