[FFmpeg-cvslog] r20285 - in trunk: configure libavcodec/Makefile libavcodec/dsputil.c libavcodec/x86/dsputilenc_mmx.c

[jbr]

Author: jbr
Date: Sun Oct 18 21:51:18 2009
New Revision: 20285

Log:
add CONFIG_LPC to the build system for lpc dsputil functions. fixes build 
problems when lpc.c is not compiled.

Modified:
   trunk/configure
   trunk/libavcodec/Makefile
   trunk/libavcodec/dsputil.c
   trunk/libavcodec/x86/dsputilenc_mmx.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sun Oct 18 20:51:54 2009	(r20284)
+++ trunk/configure	Sun Oct 18 21:51:18 2009	(r20285)
@@ -99,6 +99,7 @@ show_help(){
   echo "  --disable-aandct         disable AAN DCT code"
   echo "  --disable-fft            disable FFT code"
   echo "  --disable-golomb         disable Golomb code"
+  echo "  --disable-lpc            disable LPC code"
   echo "  --disable-mdct           disable MDCT code"
   echo "  --disable-rdft           disable RDFT code"
   echo "  --disable-vaapi          disable VAAPI code"
@@ -836,6 +837,7 @@ CONFIG_LIST="
     libvorbis
     libx264
     libxvid
+    lpc
     mdct
     memalign_hack
     mlib
@@ -1066,6 +1068,7 @@ inline_asm_deps="!tms470"
 aac_decoder_select="fft mdct"
 aac_encoder_select="fft mdct"
 ac3_decoder_select="fft mdct"
+alac_encoder_select="lpc"
 atrac3_decoder_select="fft mdct"
 cavs_decoder_select="golomb"
 cook_decoder_select="fft mdct"
@@ -1079,7 +1082,7 @@ eatgq_decoder_select="aandct"
 eatqi_decoder_select="aandct"
 ffv1_decoder_select="golomb"
 flac_decoder_select="golomb"
-flac_encoder_select="golomb"
+flac_encoder_select="golomb lpc"
 flashsv_decoder_select="zlib"
 flashsv_encoder_select="zlib"
 flv_encoder_select="h263_encoder"

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	Sun Oct 18 20:51:54 2009	(r20284)
+++ trunk/libavcodec/Makefile	Sun Oct 18 21:51:18 2009	(r20285)
@@ -563,6 +563,7 @@ YASM-OBJS-$(CONFIG_GPL)                +
 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/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         \

Modified: trunk/libavcodec/dsputil.c
==============================================================================
--- trunk/libavcodec/dsputil.c	Sun Oct 18 20:51:54 2009	(r20284)
+++ trunk/libavcodec/dsputil.c	Sun Oct 18 21:51:18 2009	(r20285)
@@ -4837,7 +4837,9 @@ void dsputil_init(DSPContext* c, AVCodec
 #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;

Modified: trunk/libavcodec/x86/dsputilenc_mmx.c
==============================================================================
--- trunk/libavcodec/x86/dsputilenc_mmx.c	Sun Oct 18 20:51:54 2009	(r20284)
+++ trunk/libavcodec/x86/dsputilenc_mmx.c	Sun Oct 18 21:51:18 2009	(r20285)
@@ -1413,7 +1413,9 @@ void dsputilenc_init_mmx(DSPContext* c, 
             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