summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-06-20 03:22:10 -0700
committerDiego Biurrun <diego@biurrun.de>2014-06-22 06:28:46 -0700
commit03391b5432a2b8b8dbc3d2db722a54dfb68737b9 (patch)
tree9d01f4d5298dbf1efcf8290dd7cd3a5fe1991adb
parent49470b9404583ab3aff6835f78a759349d331696 (diff)
build: Add missing object files for Matroska demuxer
-rw-r--r--libavcodec/Makefile3
-rw-r--r--libavformat/Makefile3
2 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index c2f75329e4..9cf2bea2fc 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -565,7 +565,8 @@ OBJS-$(CONFIG_ISMV_MUXER) += mpeg4audio.o mpegaudiodata.o
OBJS-$(CONFIG_LATM_MUXER) += mpeg4audio.o
OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER) += xiph.o mpeg4audio.o \
flac.o flacdata.o
-OBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio.o mpegaudiodata.o
+OBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio.o mpegaudiodata.o \
+ vorbis_parser.o xiph.o
OBJS-$(CONFIG_MATROSKA_MUXER) += mpeg4audio.o mpegaudiodata.o \
flac.o flacdata.o xiph.o
OBJS-$(CONFIG_MP2_MUXER) += mpegaudiodata.o mpegaudiodecheader.o
diff --git a/libavformat/Makefile b/libavformat/Makefile
index a26ffcd7bb..51bd7c2f94 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -166,7 +166,8 @@ OBJS-$(CONFIG_M4V_DEMUXER) += m4vdec.o rawdec.o
OBJS-$(CONFIG_M4V_MUXER) += rawenc.o
OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \
isom.o rmsipr.o \
- oggparsevorbis.o vorbiscomment.o
+ oggparsevorbis.o vorbiscomment.o \
+ flac_picture.o replaygain.o
OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \
isom.o avc.o hevc.o \
flacenc_header.o avlanguage.o vorbiscomment.o wv.o