diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-07-20 09:24:59 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-07-20 09:24:59 +0000 |
| commit | e82dc4c91e604c29802344959628f1114815ebd3 (patch) | |
| tree | 34125456862ec5f77dfc06edcb2545ea551db05d | |
| parent | 64101340001fd1cd2e06d82f20667b88dfeb706b (diff) | |
| download | ffmpeg-e82dc4c91e604c29802344959628f1114815ebd3.tar.gz | |
Make VP6A/VP6F decoders depend on the VP6 decoder.
They share so much code that enabling one without the other is pointless.
Originally committed as revision 19468 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/Makefile | 8 |
2 files changed, 2 insertions, 8 deletions
@@ -1117,6 +1117,8 @@ vc1_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" vc1_vdpau_decoder_select="vdpau vc1_decoder" vorbis_decoder_select="fft mdct" vorbis_encoder_select="fft mdct" +vp6a_decoder_select="vp6_decoder" +vp6f_decoder_select="vp6_decoder" wmav1_decoder_select="fft mdct" wmav1_encoder_select="fft mdct" wmav2_decoder_select="fft mdct" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index f481b127aa..e36cd11891 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -248,8 +248,6 @@ OBJS-$(CONFIG_VORBIS_ENCODER) += vorbis_enc.o vorbis.o vorbis_data.o OBJS-$(CONFIG_VP3_DECODER) += vp3.o vp3dsp.o OBJS-$(CONFIG_VP5_DECODER) += vp5.o vp56.o vp56data.o vp3dsp.o OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o vp3dsp.o vp6dsp.o huffman.o -OBJS-$(CONFIG_VP6A_DECODER) += vp6.o vp56.o vp56data.o vp3dsp.o vp6dsp.o huffman.o -OBJS-$(CONFIG_VP6F_DECODER) += vp6.o vp56.o vp56data.o vp3dsp.o vp6dsp.o huffman.o OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o OBJS-$(CONFIG_WMAV1_DECODER) += wmadec.o wma.o @@ -461,10 +459,6 @@ MMX-OBJS-$(CONFIG_VP3_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o MMX-OBJS-$(CONFIG_VP5_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o MMX-OBJS-$(CONFIG_VP6_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o \ x86/vp6dsp_mmx.o x86/vp6dsp_sse2.o -MMX-OBJS-$(CONFIG_VP6A_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o \ - x86/vp6dsp_mmx.o x86/vp6dsp_sse2.o -MMX-OBJS-$(CONFIG_VP6F_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o \ - x86/vp6dsp_mmx.o x86/vp6dsp_sse2.o MMX-OBJS-$(HAVE_YASM) += x86/dsputil_yasm.o \ $(YASM-OBJS-yes) @@ -529,8 +523,6 @@ ALTIVEC-OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o ALTIVEC-OBJS-$(CONFIG_VP3_DECODER) += ppc/vp3dsp_altivec.o ALTIVEC-OBJS-$(CONFIG_VP5_DECODER) += ppc/vp3dsp_altivec.o ALTIVEC-OBJS-$(CONFIG_VP6_DECODER) += ppc/vp3dsp_altivec.o -ALTIVEC-OBJS-$(CONFIG_VP6A_DECODER) += ppc/vp3dsp_altivec.o -ALTIVEC-OBJS-$(CONFIG_VP6F_DECODER) += ppc/vp3dsp_altivec.o OBJS-$(HAVE_ALTIVEC) += ppc/check_altivec.o \ ppc/dsputil_altivec.o \ |