changeset 10429:289dd8daf4ee libavcodec

add CONFIG_LPC to the build system for lpc dsputil functions. fixes build problems when lpc.c is not compiled.
author jbr
date Sun, 18 Oct 2009 19:51:18 +0000
parents 99a26e9d6e1b
children 12c8175d6db5
files Makefile dsputil.c x86/dsputilenc_mmx.c
diffstat 3 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Oct 18 18:51:54 2009 +0000
+++ b/Makefile	Sun Oct 18 19:51:18 2009 +0000
@@ -563,6 +563,7 @@
 MMX-OBJS-$(CONFIG_CAVS_DECODER)        += x86/cavsdsp_mmx.o
 MMX-OBJS-$(CONFIG_ENCODERS)            += x86/dsputilenc_mmx.o
 MMX-OBJS-$(CONFIG_GPL)                 += x86/idct_mmx.o
+MMX-OBJS-$(CONFIG_LPC)                 += x86/lpc_mmx.o
 MMX-OBJS-$(CONFIG_SNOW_DECODER)        += x86/snowdsp_mmx.o
 MMX-OBJS-$(CONFIG_VC1_DECODER)         += x86/vc1dsp_mmx.o
 MMX-OBJS-$(CONFIG_VP3_DECODER)         += x86/vp3dsp_mmx.o              \
@@ -583,7 +584,6 @@
                                           x86/fft.o                     \
                                           x86/idct_mmx_xvid.o           \
                                           x86/idct_sse2_xvid.o          \
-                                          x86/lpc_mmx.o                 \
                                           x86/motion_est_mmx.o          \
                                           x86/mpegvideo_mmx.o           \
                                           x86/simple_idct_mmx.o         \
--- a/dsputil.c	Sun Oct 18 18:51:54 2009 +0000
+++ b/dsputil.c	Sun Oct 18 19:51:18 2009 +0000
@@ -4837,7 +4837,9 @@
 #if CONFIG_AC3_DECODER
     c->ac3_downmix = ff_ac3_downmix_c;
 #endif
+#if CONFIG_LPC
     c->lpc_compute_autocorr = ff_lpc_compute_autocorr;
+#endif
     c->vector_fmul = vector_fmul_c;
     c->vector_fmul_reverse = vector_fmul_reverse_c;
     c->vector_fmul_add = vector_fmul_add_c;
--- a/x86/dsputilenc_mmx.c	Sun Oct 18 18:51:54 2009 +0000
+++ b/x86/dsputilenc_mmx.c	Sun Oct 18 19:51:18 2009 +0000
@@ -1413,7 +1413,9 @@
             c->sum_abs_dctelem= sum_abs_dctelem_sse2;
             c->hadamard8_diff[0]= hadamard8_diff16_sse2;
             c->hadamard8_diff[1]= hadamard8_diff_sse2;
+#if CONFIG_LPC
             c->lpc_compute_autocorr = ff_lpc_compute_autocorr_sse2;
+#endif
         }
 
 #if HAVE_SSSE3