[FFmpeg-cvslog] build: Fix MP2 muxer dependencies

Diego Biurrun git at videolan.org
Fri Jul 13 00:57:00 CEST 2012


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Tue Jul 10 18:39:23 2012 +0200| [b7884ff7af91c741d3629c150b998c989eef6d8c] | committer: Diego Biurrun

build: Fix MP2 muxer dependencies

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b7884ff7af91c741d3629c150b998c989eef6d8c
---

 libavcodec/Makefile  |    1 +
 libavformat/Makefile |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 1e4ed69..3eb862d 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 554adbd..a5a331e 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



More information about the ffmpeg-cvslog mailing list