# HG changeset patch
# User darkshikari
# Date 1281222625 0
# Node ID 2ea2fd28da079e21532d73e17c319d832f7ad722
# Parent  3fbaf3a70b2925e1c7e7478416f24495796796b1
Split h264dsp and h264pred in configure.
Many H.264 derivatives, like RV40 and VP8, use the H.264 prediction functions
but not the weight/loopfilter functions.
This should reduce the size of builds with one of these derivatives but without
H.264 decoding itself.

diff -r 3fbaf3a70b29 -r 2ea2fd28da07 Makefile
--- a/Makefile	Sat Aug 07 14:11:43 2010 +0000
+++ b/Makefile	Sat Aug 07 23:10:25 2010 +0000
@@ -32,7 +32,8 @@
 FFT-OBJS-$(CONFIG_HARDCODED_TABLES)    += cos_tables.o
 OBJS-$(CONFIG_FFT)                     += avfft.o fft.o $(FFT-OBJS-yes)
 OBJS-$(CONFIG_GOLOMB)                  += golomb.o
-OBJS-$(CONFIG_H264DSP)                 += h264dsp.o h264idct.o h264pred.o
+OBJS-$(CONFIG_H264DSP)                 += h264dsp.o h264idct.o
+OBJS-$(CONFIG_H264PRED)                += h264pred.o
 OBJS-$(CONFIG_HUFFMAN)                 += huffman.o
 OBJS-$(CONFIG_LPC)                     += lpc.o
 OBJS-$(CONFIG_LSP)                     += lsp.o
diff -r 3fbaf3a70b29 -r 2ea2fd28da07 arm/Makefile
--- a/arm/Makefile	Sat Aug 07 14:11:43 2010 +0000
+++ b/arm/Makefile	Sat Aug 07 23:10:25 2010 +0000
@@ -3,8 +3,8 @@
 OBJS-$(CONFIG_VP5_DECODER)             += arm/vp56dsp_init_arm.o
 OBJS-$(CONFIG_VP6_DECODER)             += arm/vp56dsp_init_arm.o
 
-OBJS-$(CONFIG_H264DSP)                 += arm/h264dsp_init_arm.o        \
-                                          arm/h264pred_init_arm.o       \
+OBJS-$(CONFIG_H264DSP)                 += arm/h264dsp_init_arm.o
+OBJS-$(CONFIG_H264PRED)                += arm/h264pred_init_arm.o
 
 OBJS                                   += arm/dsputil_init_arm.o        \
                                           arm/dsputil_arm.o             \
@@ -36,7 +36,8 @@
 
 NEON-OBJS-$(CONFIG_H264DSP)            += arm/h264dsp_neon.o            \
                                           arm/h264idct_neon.o           \
-                                          arm/h264pred_neon.o           \
+
+NEON-OBJS-$(CONFIG_H264PRED)           += arm/h264pred_neon.o           \
 
 NEON-OBJS-$(CONFIG_DCA_DECODER)        += arm/dcadsp_neon.o             \
                                           arm/synth_filter_neon.o       \
diff -r 3fbaf3a70b29 -r 2ea2fd28da07 x86/Makefile
--- a/x86/Makefile	Sat Aug 07 14:11:43 2010 +0000
+++ b/x86/Makefile	Sat Aug 07 23:10:25 2010 +0000
@@ -9,9 +9,10 @@
 YASM-OBJS-$(CONFIG_GPL)                += x86/h264_idct_sse2.o          \
 
 YASM-OBJS-$(CONFIG_H264DSP)            += x86/h264_deblock_sse2.o       \
-                                          x86/h264_intrapred.o          \
                                           x86/h264_weight_sse2.o        \
 
+YASM-OBJS-$(CONFIG_H264PRED)           += x86/h264_intrapred.o
+
 YASM-OBJS-$(CONFIG_VC1_DECODER)        += x86/vc1dsp_yasm.o
 
 MMX-OBJS-$(CONFIG_CAVS_DECODER)        += x86/cavsdsp_mmx.o
diff -r 3fbaf3a70b29 -r 2ea2fd28da07 x86/h264dsp_mmx.c
--- a/x86/h264dsp_mmx.c	Sat Aug 07 14:11:43 2010 +0000
+++ b/x86/h264dsp_mmx.c	Sat Aug 07 23:10:25 2010 +0000
@@ -2365,7 +2365,7 @@
 void ff_pred4x4_tm_vp8_ssse3       (uint8_t *src, const uint8_t *topright, int stride);
 void ff_pred4x4_vertical_vp8_mmxext(uint8_t *src, const uint8_t *topright, int stride);
 
-#if CONFIG_H264DSP
+#if CONFIG_H264PRED
 void ff_h264_pred_init_x86(H264PredContext *h, int codec_id)
 {
     mm_flags = mm_support();