diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-07-16 12:50:14 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-07-18 10:32:18 +0100 |
| commit | ab9f9876615fd856184912cf3863a80cf3a721b6 (patch) | |
| tree | 54c610825ee8848343b76efa7b798651b5d95ec6 | |
| parent | 4cfb0d871d4885a88061410ab8f3583018c1ac57 (diff) | |
| download | ffmpeg-ab9f9876615fd856184912cf3863a80cf3a721b6.tar.gz | |
build: add CONFIG_VP3DSP, reduce repetition in OBJS lists
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | libavcodec/Makefile | 7 | ||||
| -rw-r--r-- | libavcodec/arm/Makefile | 4 | ||||
| -rw-r--r-- | libavcodec/x86/Makefile | 6 |
4 files changed, 11 insertions, 11 deletions
@@ -1192,6 +1192,7 @@ CONFIG_EXTRA=" huffman lgplv3 lpc + vp3dsp " CMDLINE_SELECT=" @@ -1415,7 +1416,9 @@ vc1_vdpau_decoder_select="vdpau vc1_decoder" vc1image_decoder_select="vc1_decoder" vorbis_decoder_select="mdct" vorbis_encoder_select="mdct" -vp6_decoder_select="huffman" +vp3_decoder_select="vp3dsp" +vp5_decoder_select="vp3dsp" +vp6_decoder_select="huffman vp3dsp" vp6a_decoder_select="vp6_decoder" vp6f_decoder_select="vp6_decoder" vp8_decoder_select="h264pred h264qpel" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 2cc02b179f..c0a27567b5 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -55,6 +55,7 @@ OBJS-$(CONFIG_SINEWIN) += sinewin.o OBJS-$(CONFIG_VAAPI) += vaapi.o OBJS-$(CONFIG_VDA) += vda.o OBJS-$(CONFIG_VDPAU) += vdpau.o +OBJS-$(CONFIG_VP3DSP) += vp3dsp.o # decoders/encoders/hardware accelerators OBJS-$(CONFIG_A64MULTI_ENCODER) += a64multienc.o elbg.o @@ -428,11 +429,11 @@ OBJS-$(CONFIG_VORBIS_DECODER) += vorbisdec.o vorbis.o \ vorbis_data.o xiph.o OBJS-$(CONFIG_VORBIS_ENCODER) += vorbisenc.o vorbis.o \ vorbis_data.o -OBJS-$(CONFIG_VP3_DECODER) += vp3.o vp3dsp.o +OBJS-$(CONFIG_VP3_DECODER) += vp3.o OBJS-$(CONFIG_VP5_DECODER) += vp5.o vp56.o vp56data.o vp56dsp.o \ - vp3dsp.o vp56rac.o + vp56rac.o OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o vp56dsp.o \ - vp3dsp.o vp6dsp.o vp56rac.o + vp6dsp.o vp56rac.o OBJS-$(CONFIG_VP8_DECODER) += vp8.o vp8dsp.o vp56rac.o OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index d2bdd50daa..60cb2072ae 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -75,13 +75,11 @@ NEON-OBJS-$(CONFIG_RV40_DECODER) += arm/rv34dsp_init_neon.o \ arm/rv40dsp_neon.o \ arm/h264cmc_neon.o \ -NEON-OBJS-$(CONFIG_VP3_DECODER) += arm/vp3dsp_neon.o +NEON-OBJS-$(CONFIG_VP3DSP) += arm/vp3dsp_neon.o NEON-OBJS-$(CONFIG_VP5_DECODER) += arm/vp56dsp_neon.o \ - arm/vp3dsp_neon.o \ NEON-OBJS-$(CONFIG_VP6_DECODER) += arm/vp56dsp_neon.o \ - arm/vp3dsp_neon.o \ NEON-OBJS-$(CONFIG_VP8_DECODER) += arm/vp8dsp_init_neon.o \ arm/vp8dsp_neon.o diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 6464739d03..1949074c58 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -59,10 +59,8 @@ YASM-OBJS-$(CONFIG_RV30_DECODER) += x86/rv34dsp.o YASM-OBJS-$(CONFIG_RV40_DECODER) += x86/rv34dsp.o \ x86/rv40dsp.o YASM-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_yasm.o -YASM-OBJS-$(CONFIG_VP3_DECODER) += x86/vp3dsp.o -YASM-OBJS-$(CONFIG_VP5_DECODER) += x86/vp3dsp.o -YASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp3dsp.o \ - x86/vp56dsp.o +YASM-OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp.o +YASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp.o YASM-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp.o YASM-OBJS += x86/dsputil_yasm.o \ |