aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2010-06-04 22:40:54 +0000
committerDavid Conrad <lessen42@gmail.com>2010-06-04 22:40:54 +0000
commit316d6c153caffaa9886968783e8d00aa9aca2640 (patch)
tree627c25cf495b4052c4132b7cea8caba98d9c40ec /libavcodec
parentac9baa716b8369d7df225f25f9e5eee7bd512b80 (diff)
downloadffmpeg-316d6c153caffaa9886968783e8d00aa9aca2640.tar.gz
Add WebM muxer
Patch by James Zern <jzern at google> Originally committed as revision 23474 to svn://svn.ffmpeg.org/ffmpeg/trunk
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 c4e7bedf70..268e13f65f 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -512,6 +512,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