From f4d608e344f2868ce50a386015f41d2bb21fb14d Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Sun, 18 Oct 2009 19:51:18 +0000
Subject: add CONFIG_LPC to the build system for lpc dsputil functions. fixes
 build problems when lpc.c is not compiled.

Originally committed as revision 20285 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/Makefile             | 2 +-
 libavcodec/dsputil.c            | 2 ++
 libavcodec/x86/dsputilenc_mmx.c | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'libavcodec')

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 0dab3b8e43..ee35f77f7a 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -563,6 +563,7 @@ YASM-OBJS-$(CONFIG_GPL)                += x86/h264_deblock_sse2.o       \
 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 @@ OBJS-$(HAVE_MMX)                       += x86/cpuid.o                   \
                                           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         \
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index aae86bcb21..0500872036 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -4837,7 +4837,9 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx)
 #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;
diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c
index 2bf0fe1328..a7fafe0605 100644
--- a/libavcodec/x86/dsputilenc_mmx.c
+++ b/libavcodec/x86/dsputilenc_mmx.c
@@ -1413,7 +1413,9 @@ void dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx)
             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
-- 
cgit v1.2.3