[FFmpeg-cvslog] r19468 - in trunk: configure libavcodec/Makefile

[diego]

Author: diego
Date: Mon Jul 20 11:24:59 2009
New Revision: 19468

Log:
Make VP6A/VP6F decoders depend on the VP6 decoder.
They share so much code that enabling one without the other is pointless.

Modified:
   trunk/configure
   trunk/libavcodec/Makefile

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sun Jul 19 13:14:43 2009	(r19467)
+++ trunk/configure	Mon Jul 20 11:24:59 2009	(r19468)
@@ -1117,6 +1117,8 @@ vc1_vdpau_decoder_deps="vdpau_vdpau_h vd
 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"

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	Sun Jul 19 13:14:43 2009	(r19467)
+++ trunk/libavcodec/Makefile	Mon Jul 20 11:24:59 2009	(r19468)
@@ -248,8 +248,6 @@ OBJS-$(CONFIG_VORBIS_ENCODER)          +
 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)         +
 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)     +
 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         \