summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2012-07-10 18:39:23 +0200
committerDiego Biurrun <diego@biurrun.de>2012-07-12 10:45:21 +0200
commitb7884ff7af91c741d3629c150b998c989eef6d8c (patch)
tree8e5b7017015d6b8ebbb9f8efca62a7b0aa495d7d
parentd648de61e63360d27c06890ca14213c62abc2e39 (diff)
build: Fix MP2 muxer dependencies
-rw-r--r--libavcodec/Makefile1
-rw-r--r--libavformat/Makefile2
2 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 1e4ed69fa3..3eb862d8f6 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -578,6 +578,7 @@ OBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio.o mpegaudiodata.o
OBJS-$(CONFIG_MATROSKA_MUXER) += xiph.o mpeg4audio.o \
flacdec.o flacdata.o flac.o \
mpegaudiodata.o
+OBJS-$(CONFIG_MP2_MUXER) += mpegaudiodata.o mpegaudiodecheader.o
OBJS-$(CONFIG_MP3_MUXER) += mpegaudiodata.o mpegaudiodecheader.o
OBJS-$(CONFIG_MOV_DEMUXER) += mpeg4audio.o mpegaudiodata.o ac3tab.o
OBJS-$(CONFIG_MOV_MUXER) += mpeg4audio.o mpegaudiodata.o
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 554adbd21d..a5a331efd6 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -149,7 +149,7 @@ OBJS-$(CONFIG_MOV_DEMUXER) += mov.o isom.o mov_chan.o
OBJS-$(CONFIG_MOV_MUXER) += movenc.o isom.o avc.o \
movenchint.o rtpenc_chain.o \
mov_chan.o
-OBJS-$(CONFIG_MP2_MUXER) += mp3enc.o rawenc.o
+OBJS-$(CONFIG_MP2_MUXER) += mp3enc.o rawenc.o id3v2enc.o
OBJS-$(CONFIG_MP3_DEMUXER) += mp3dec.o
OBJS-$(CONFIG_MP3_MUXER) += mp3enc.o rawenc.o id3v2enc.o
OBJS-$(CONFIG_MPC_DEMUXER) += mpc.o apetag.o