Commit 3b299a9a authored by diego's avatar diego

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


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@20959 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 05a628ca
...@@ -1166,6 +1166,7 @@ theora_decoder_select="vp3_decoder" ...@@ -1166,6 +1166,7 @@ theora_decoder_select="vp3_decoder"
tiff_decoder_suggest="zlib" tiff_decoder_suggest="zlib"
tiff_encoder_suggest="zlib" tiff_encoder_suggest="zlib"
tscc_decoder_select="zlib" tscc_decoder_select="zlib"
vc1_decoder_select="h263_decoder"
vc1_vaapi_hwaccel_deps="va_va_h" vc1_vaapi_hwaccel_deps="va_va_h"
vc1_vaapi_hwaccel_select="vaapi vc1_decoder" vc1_vaapi_hwaccel_select="vaapi vc1_decoder"
vc1_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" vc1_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
...@@ -1178,7 +1179,9 @@ wmav1_decoder_select="fft mdct" ...@@ -1178,7 +1179,9 @@ wmav1_decoder_select="fft mdct"
wmav1_encoder_select="fft mdct" wmav1_encoder_select="fft mdct"
wmav2_decoder_select="fft mdct" wmav2_decoder_select="fft mdct"
wmav2_encoder_select="fft mdct" wmav2_encoder_select="fft mdct"
wmv1_decoder_select="h263_decoder"
wmv1_encoder_select="h263_encoder" wmv1_encoder_select="h263_encoder"
wmv2_decoder_select="h263_decoder"
wmv2_encoder_select="h263_encoder" wmv2_encoder_select="h263_encoder"
wmv3_decoder_select="vc1_decoder" wmv3_decoder_select="vc1_decoder"
wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel" wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
......
...@@ -308,9 +308,7 @@ OBJS-$(CONFIG_V210X_DECODER) += v210x.o ...@@ -308,9 +308,7 @@ OBJS-$(CONFIG_V210X_DECODER) += v210x.o
OBJS-$(CONFIG_VB_DECODER) += vb.o OBJS-$(CONFIG_VB_DECODER) += vb.o
OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1.o vc1data.o vc1dsp.o \ OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1.o vc1data.o vc1dsp.o \
msmpeg4.o msmpeg4data.o \ msmpeg4.o msmpeg4data.o \
h263dec.o h263.o \ intrax8.o intrax8dsp.o
intrax8.o intrax8dsp.o \
mpegvideo.o error_resilience.o
OBJS-$(CONFIG_VC1_VAAPI_HWACCEL) += vaapi_vc1.o OBJS-$(CONFIG_VC1_VAAPI_HWACCEL) += vaapi_vc1.o
OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o
OBJS-$(CONFIG_VCR1_ENCODER) += vcr1.o OBJS-$(CONFIG_VCR1_ENCODER) += vcr1.o
...@@ -333,13 +331,9 @@ OBJS-$(CONFIG_WMAV1_DECODER) += wmadec.o wma.o ...@@ -333,13 +331,9 @@ OBJS-$(CONFIG_WMAV1_DECODER) += wmadec.o wma.o
OBJS-$(CONFIG_WMAV1_ENCODER) += wmaenc.o wma.o OBJS-$(CONFIG_WMAV1_ENCODER) += wmaenc.o wma.o
OBJS-$(CONFIG_WMAV2_DECODER) += wmadec.o wma.o OBJS-$(CONFIG_WMAV2_DECODER) += wmadec.o wma.o
OBJS-$(CONFIG_WMAV2_ENCODER) += wmaenc.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 \ OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o \
msmpeg4.o msmpeg4data.o \ msmpeg4.o msmpeg4data.o \
h263dec.o h263.o \ intrax8.o intrax8dsp.o
intrax8.o intrax8dsp.o \
mpegvideo.o error_resilience.o
OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o \ OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o \
msmpeg4.o msmpeg4data.o msmpeg4.o msmpeg4data.o
OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment