diff options
| author | Jason Garrett-Glaser <darkshikari@gmail.com> | 2010-08-07 23:10:25 +0000 |
|---|---|---|
| committer | Jason Garrett-Glaser <darkshikari@gmail.com> | 2010-08-07 23:10:25 +0000 |
| commit | 4a384de5b8ced22e05d29e08b885a8d79968adf5 (patch) | |
| tree | 06748e8272176e4ba6c1fc7ee1bf733b4c582cd0 /libavcodec | |
| parent | 73c44cb2869bfdbea829942eb35efa6d4c4e2f91 (diff) | |
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.
Originally committed as revision 24741 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 3 | ||||
| -rw-r--r-- | libavcodec/arm/Makefile | 7 | ||||
| -rw-r--r-- | libavcodec/x86/Makefile | 3 | ||||
| -rw-r--r-- | libavcodec/x86/h264dsp_mmx.c | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index e29666a3d9..1422b5c279 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -32,7 +32,8 @@ OBJS-$(CONFIG_DXVA2) += dxva2.o 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 --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index bab4b875c0..4c30e0ab9f 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -3,8 +3,8 @@ OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_init_arm.o \ 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_RDFT) += arm/rdft_neon.o \ 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 --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 4ca7c01600..6397378605 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -9,9 +9,10 @@ YASM-OBJS-$(CONFIG_FFT) += x86/fft_mmx.o \ 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 --git a/libavcodec/x86/h264dsp_mmx.c b/libavcodec/x86/h264dsp_mmx.c index 992e0dd4c8..ebd87518ba 100644 --- a/libavcodec/x86/h264dsp_mmx.c +++ b/libavcodec/x86/h264dsp_mmx.c @@ -2365,7 +2365,7 @@ void ff_pred4x4_tm_vp8_mmxext (uint8_t *src, const uint8_t *topright, int s 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(); |