summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2010-06-09 15:54:27 +0000
committerReinhard Tartler <siretart@tauware.de>2010-06-09 15:54:27 +0000
commitdb06ddf8c6711d99eb903359c0118b63ec129c27 (patch)
tree27eea059864f74bcd256eaea6ff2e86cc4edad56 /libavcodec
parenteb4b8b96fcb2192ba118315bfee6651400888323 (diff)
Add WebM muxer
Patch by James Zern <jzern at google> backport r23474 by conrad Originally committed as revision 23549 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 562e162511..00e6b57fd3 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -501,6 +501,8 @@ OBJS-$(CONFIG_OGG_DEMUXER) += flacdec.o flacdata.o flac.o \
dirac.o mpeg12data.o
OBJS-$(CONFIG_OGG_MUXER) += xiph.o flacdec.o flacdata.o flac.o
OBJS-$(CONFIG_RTP_MUXER) += mpegvideo.o
+OBJS-$(CONFIG_WEBM_MUXER) += xiph.o mpeg4audio.o \
+ flacdec.o flacdata.o flac.o
# external codec libraries
OBJS-$(CONFIG_LIBDIRAC_DECODER) += libdiracdec.o