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

[diego]

Author: diego
Date: Tue Dec 29 12:11:07 2009
New Revision: 20959

Log:
Declare WMV1/WMV2/VC-1 decoder dependency on the H.263 decoder in configure.

Modified:
   trunk/configure
   trunk/libavcodec/Makefile

Modified: trunk/configure
==============================================================================
--- trunk/configure	Tue Dec 29 10:13:53 2009	(r20958)
+++ trunk/configure	Tue Dec 29 12:11:07 2009	(r20959)
@@ -1166,6 +1166,7 @@ theora_decoder_select="vp3_decoder"
 tiff_decoder_suggest="zlib"
 tiff_encoder_suggest="zlib"
 tscc_decoder_select="zlib"
+vc1_decoder_select="h263_decoder"
 vc1_vaapi_hwaccel_deps="va_va_h"
 vc1_vaapi_hwaccel_select="vaapi vc1_decoder"
 vc1_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
@@ -1178,7 +1179,9 @@ wmav1_decoder_select="fft mdct"
 wmav1_encoder_select="fft mdct"
 wmav2_decoder_select="fft mdct"
 wmav2_encoder_select="fft mdct"
+wmv1_decoder_select="h263_decoder"
 wmv1_encoder_select="h263_encoder"
+wmv2_decoder_select="h263_decoder"
 wmv2_encoder_select="h263_encoder"
 wmv3_decoder_select="vc1_decoder"
 wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	Tue Dec 29 10:13:53 2009	(r20958)
+++ trunk/libavcodec/Makefile	Tue Dec 29 12:11:07 2009	(r20959)
@@ -308,9 +308,7 @@ OBJS-$(CONFIG_V210X_DECODER)           +
 OBJS-$(CONFIG_VB_DECODER)              += vb.o
 OBJS-$(CONFIG_VC1_DECODER)             += vc1dec.o vc1.o vc1data.o vc1dsp.o \
                                           msmpeg4.o msmpeg4data.o           \
-                                          h263dec.o h263.o                  \
-                                          intrax8.o intrax8dsp.o            \
-                                          mpegvideo.o error_resilience.o
+                                          intrax8.o intrax8dsp.o
 OBJS-$(CONFIG_VC1_VAAPI_HWACCEL)       += vaapi_vc1.o
 OBJS-$(CONFIG_VCR1_DECODER)            += vcr1.o
 OBJS-$(CONFIG_VCR1_ENCODER)            += vcr1.o
@@ -333,13 +331,9 @@ OBJS-$(CONFIG_WMAV1_DECODER)           +
 OBJS-$(CONFIG_WMAV1_ENCODER)           += wmaenc.o wma.o
 OBJS-$(CONFIG_WMAV2_DECODER)           += wmadec.o wma.o
 OBJS-$(CONFIG_WMAV2_ENCODER)           += wmaenc.o wma.o
-OBJS-$(CONFIG_WMV1_DECODER)            += h263dec.o h263.o \
-                                          mpegvideo.o error_resilience.o
 OBJS-$(CONFIG_WMV2_DECODER)            += wmv2dec.o wmv2.o        \
                                           msmpeg4.o msmpeg4data.o \
-                                          h263dec.o h263.o        \
-                                          intrax8.o intrax8dsp.o  \
-                                          mpegvideo.o error_resilience.o
+                                          intrax8.o intrax8dsp.o
 OBJS-$(CONFIG_WMV2_ENCODER)            += wmv2enc.o wmv2.o \
                                           msmpeg4.o msmpeg4data.o
 OBJS-$(CONFIG_WNV1_DECODER)            += wnv1.o