From 4264a0dd54420182ce0d083b308452739311edaa Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 19 Aug 2012 23:19:38 +0200 Subject: [PATCH] build: Make the E-AC-3 encoder select the AC-3 encoder The E-AC-3 encoder depends on almost all of the code of the AC-3 encoder, so it makes no sense to enable one without the other. --- configure | 2 +- libavcodec/Makefile | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 18f81e4d31..bf8f5f1848 100755 --- a/configure +++ b/configure @@ -1360,7 +1360,7 @@ dca_decoder_select="mdct" dnxhd_encoder_select="aandcttables mpegvideoenc" dxa_decoder_select="zlib" eac3_decoder_select="ac3_decoder" -eac3_encoder_select="mdct ac3dsp" +eac3_encoder_select="ac3_encoder" eamad_decoder_select="aandcttables error_resilience" eatgq_decoder_select="aandcttables" eatqi_decoder_select="aandcttables error_resilience mpegvideo" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index f8b67b852a..2db999d487 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -144,8 +144,7 @@ OBJS-$(CONFIG_DVVIDEO_ENCODER) += dv.o dvdata.o dv_profile.o OBJS-$(CONFIG_DXA_DECODER) += dxa.o OBJS-$(CONFIG_DXTORY_DECODER) += dxtory.o OBJS-$(CONFIG_EAC3_DECODER) += eac3dec.o eac3_data.o -OBJS-$(CONFIG_EAC3_ENCODER) += eac3enc.o ac3enc.o ac3enc_float.o \ - ac3tab.o ac3.o kbdwin.o eac3_data.o +OBJS-$(CONFIG_EAC3_ENCODER) += eac3enc.o eac3_data.o OBJS-$(CONFIG_EACMV_DECODER) += eacmv.o OBJS-$(CONFIG_EAMAD_DECODER) += eamad.o eaidct.o mpeg12.o \ mpeg12data.o