Mercurial > libavformat.hg

changeset 2520:0488036c96ba libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enable Matroska muxer
author conrad
date Wed, 05 Sep 2007 00:38:42 +0000
parents 0ddd5ae4c702
children 776b5c2a1bf1
files Makefile allformats.c allformats.h
diffstat 3 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed Sep 05 00:26:11 2007 +0000
+++ b/Makefile	Wed Sep 05 00:38:42 2007 +0000
@@ -70,7 +70,9 @@
 OBJS-$(CONFIG_IPMOVIE_DEMUXER)           += ipmovie.o
 OBJS-$(CONFIG_M4V_DEMUXER)               += raw.o
 OBJS-$(CONFIG_M4V_MUXER)                 += raw.o
+OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER)      += matroskaenc.o matroska.o riff.o
 OBJS-$(CONFIG_MATROSKA_DEMUXER)          += matroskadec.o matroska.o riff.o
+OBJS-$(CONFIG_MATROSKA_MUXER)            += matroskaenc.o matroska.o riff.o
 OBJS-$(CONFIG_MJPEG_DEMUXER)             += raw.o
 OBJS-$(CONFIG_MJPEG_MUXER)               += raw.o
 OBJS-$(CONFIG_MM_DEMUXER)                += mm.o
--- a/allformats.c	Wed Sep 05 00:26:11 2007 +0000
+++ b/allformats.c	Wed Sep 05 00:38:42 2007 +0000
@@ -91,7 +91,8 @@
     if (!ENABLE_NUT_DEMUXER) REGISTER_DEMUXER (LIBNUT, libnut);
     if (!ENABLE_NUT_MUXER)   REGISTER_MUXER   (LIBNUT, libnut);
     REGISTER_MUXDEMUX(M4V, m4v);
-    REGISTER_DEMUXER (MATROSKA, matroska);
+    REGISTER_MUXDEMUX(MATROSKA, matroska);
+    REGISTER_MUXER   (MATROSKA_AUDIO, matroska_audio);
     REGISTER_MUXDEMUX(MJPEG, mjpeg);
     REGISTER_DEMUXER (MM, mm);
     REGISTER_MUXDEMUX(MMF, mmf);
--- a/allformats.h	Wed Sep 05 00:26:11 2007 +0000
+++ b/allformats.h	Wed Sep 05 00:38:42 2007 +0000
@@ -144,6 +144,8 @@
 extern AVOutputFormat imagepipe_muxer;
 extern AVOutputFormat libnut_muxer;
 extern AVOutputFormat m4v_muxer;
+extern AVOutputFormat matroska_audio_muxer;
+extern AVOutputFormat matroska_muxer;
 extern AVOutputFormat mjpeg_muxer;
 extern AVOutputFormat mmf_muxer;
 extern AVOutputFormat mov_muxer;