# HG changeset patch # User conrad # Date 1188952722 0 # Node ID 0488036c96ba54d1fcd63953ec6c76f05255d5be # Parent 0ddd5ae4c70290fd84a96865fd27b060b9f23707 Enable Matroska muxer diff -r 0ddd5ae4c702 -r 0488036c96ba Makefile --- 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 diff -r 0ddd5ae4c702 -r 0488036c96ba allformats.c --- 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); diff -r 0ddd5ae4c702 -r 0488036c96ba allformats.h --- 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;