[SCM] libav/experimental: Declare AC-3 parser dependency of AC-3 decoder and EAC-3 demuxer in configure.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:56:32 UTC 2013
The following commit has been merged in the experimental branch:
commit 5b423887f4dcf2b200689e472b9e239a1cf86a6b
Author: Diego Biurrun <diego at biurrun.de>
Date: Tue Dec 29 13:14:41 2009 +0000
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
diff --git a/configure b/configure
index c4ff9f5..25e4f2c 100755
--- a/configure
+++ b/configure
@@ -1085,7 +1085,7 @@ inline_asm_deps="!tms470"
# decoders / encoders / hardware accelerators
aac_decoder_select="fft mdct aac_parser"
aac_encoder_select="fft mdct"
-ac3_decoder_select="fft mdct"
+ac3_decoder_select="fft mdct ac3_parser"
alac_encoder_select="lpc"
atrac3_decoder_select="fft mdct"
cavs_decoder_select="golomb"
@@ -1225,6 +1225,7 @@ ac3_demuxer_deps="ac3_parser"
asf_stream_muxer_select="asf_muxer"
avisynth_demuxer_deps="avisynth"
dirac_demuxer_deps="dirac_parser"
+eac3_demuxer_select="ac3_parser"
ipod_muxer_select="mov_muxer"
libnut_demuxer_deps="libnut"
libnut_muxer_deps="libnut"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 3cf5bd4..d2d1825 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -44,9 +44,7 @@ OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \
psymodel.o iirfilter.o \
mpeg4audio.o
OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o
-OBJS-$(CONFIG_AC3_DECODER) += ac3dec.o ac3tab.o \
- ac3dec_data.o ac3.o \
- ac3_parser.o aac_ac3_parser.o
+OBJS-$(CONFIG_AC3_DECODER) += ac3dec.o ac3dec_data.o ac3.o
OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o
OBJS-$(CONFIG_ALAC_DECODER) += alac.o
OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o
@@ -438,8 +436,6 @@ OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcm.o
OBJS-$(CONFIG_ADTS_MUXER) += mpeg4audio.o
OBJS-$(CONFIG_DV_DEMUXER) += 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_MUXER) += flacdec.o flacdata.o flac.o
OBJS-$(CONFIG_FLV_DEMUXER) += mpeg4audio.o
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list