Commit 5b423887 authored by Diego Biurrun's avatar Diego Biurrun

Declare AC-3 parser dependency of AC-3 decoder and EAC-3 demuxer in configure.

Originally committed as revision 20964 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent a80459fd
...@@ -1085,7 +1085,7 @@ inline_asm_deps="!tms470" ...@@ -1085,7 +1085,7 @@ inline_asm_deps="!tms470"
# decoders / encoders / hardware accelerators # decoders / encoders / hardware accelerators
aac_decoder_select="fft mdct aac_parser" aac_decoder_select="fft mdct aac_parser"
aac_encoder_select="fft mdct" aac_encoder_select="fft mdct"
ac3_decoder_select="fft mdct" ac3_decoder_select="fft mdct ac3_parser"
alac_encoder_select="lpc" alac_encoder_select="lpc"
atrac3_decoder_select="fft mdct" atrac3_decoder_select="fft mdct"
cavs_decoder_select="golomb" cavs_decoder_select="golomb"
...@@ -1225,6 +1225,7 @@ ac3_demuxer_deps="ac3_parser" ...@@ -1225,6 +1225,7 @@ ac3_demuxer_deps="ac3_parser"
asf_stream_muxer_select="asf_muxer" asf_stream_muxer_select="asf_muxer"
avisynth_demuxer_deps="avisynth" avisynth_demuxer_deps="avisynth"
dirac_demuxer_deps="dirac_parser" dirac_demuxer_deps="dirac_parser"
eac3_demuxer_select="ac3_parser"
ipod_muxer_select="mov_muxer" ipod_muxer_select="mov_muxer"
libnut_demuxer_deps="libnut" libnut_demuxer_deps="libnut"
libnut_muxer_deps="libnut" libnut_muxer_deps="libnut"
......
...@@ -44,9 +44,7 @@ OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \ ...@@ -44,9 +44,7 @@ OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \
psymodel.o iirfilter.o \ psymodel.o iirfilter.o \
mpeg4audio.o mpeg4audio.o
OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o
OBJS-$(CONFIG_AC3_DECODER) += ac3dec.o ac3tab.o \ OBJS-$(CONFIG_AC3_DECODER) += ac3dec.o ac3dec_data.o ac3.o
ac3dec_data.o ac3.o \
ac3_parser.o aac_ac3_parser.o
OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o
OBJS-$(CONFIG_ALAC_DECODER) += alac.o OBJS-$(CONFIG_ALAC_DECODER) += alac.o
OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o
...@@ -438,8 +436,6 @@ OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcm.o ...@@ -438,8 +436,6 @@ OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcm.o
OBJS-$(CONFIG_ADTS_MUXER) += mpeg4audio.o OBJS-$(CONFIG_ADTS_MUXER) += mpeg4audio.o
OBJS-$(CONFIG_DV_DEMUXER) += dvdata.o OBJS-$(CONFIG_DV_DEMUXER) += dvdata.o
OBJS-$(CONFIG_DV_MUXER) += dvdata.o OBJS-$(CONFIG_DV_MUXER) += dvdata.o
OBJS-$(CONFIG_EAC3_DEMUXER) += ac3_parser.o ac3tab.o \
aac_ac3_parser.o
OBJS-$(CONFIG_FLAC_DEMUXER) += flacdec.o flacdata.o flac.o OBJS-$(CONFIG_FLAC_DEMUXER) += flacdec.o flacdata.o flac.o
OBJS-$(CONFIG_FLAC_MUXER) += flacdec.o flacdata.o flac.o OBJS-$(CONFIG_FLAC_MUXER) += flacdec.o flacdata.o flac.o
OBJS-$(CONFIG_FLV_DEMUXER) += mpeg4audio.o OBJS-$(CONFIG_FLV_DEMUXER) += mpeg4audio.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