Make E-AC-3 decoder depend on the AC-3 decoder.

It is impossible to build E-AC-3 without AC-3.

Originally committed as revision 19477 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index f08c1de8cb86b1188dda30e29e17c1cf73a15ce2..9a3504e887ec0a58f695014dc5191883826e6033 100755 (executable)
--- a/configure
+++ b/configure
@@ -1057,7 +1057,7 @@ cscd_decoder_suggest="zlib"
 dca_decoder_select="fft mdct"
 dnxhd_encoder_select="aandct"
 dxa_decoder_select="zlib"
-eac3_decoder_select="fft mdct"
+eac3_decoder_select="ac3_decoder"
 eatgq_decoder_select="aandct"
 eatqi_decoder_select="aandct"
 ffv1_decoder_select="golomb"

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index e36cd11891afb660079d3770ba76e935f850e5ec..ad8b37f955833a0a5a3a4c3a8c1681d6ab85970f 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -75,7 +75,6 @@ OBJS-$(CONFIG_DVDSUB_ENCODER)          += dvdsubenc.o
 OBJS-$(CONFIG_DVVIDEO_DECODER)         += dv.o
 OBJS-$(CONFIG_DVVIDEO_ENCODER)         += dv.o
 OBJS-$(CONFIG_DXA_DECODER)             += dxa.o
-OBJS-$(CONFIG_EAC3_DECODER)            += eac3dec.o ac3dec.o ac3tab.o ac3dec_data.o ac3.o
 OBJS-$(CONFIG_EACMV_DECODER)           += eacmv.o
 OBJS-$(CONFIG_EAMAD_DECODER)           += eamad.o eaidct.o
 OBJS-$(CONFIG_EATGQ_DECODER)           += eatgq.o eaidct.o