diff options
| author | David Conrad <lessen42@gmail.com> | 2007-09-05 00:38:42 +0000 |
|---|---|---|
| committer | David Conrad <lessen42@gmail.com> | 2007-09-05 00:38:42 +0000 |
| commit | e09f7d61da3a08a8595400ebdde44034f0c1b10c (patch) | |
| tree | 44703b1e349e9a83eb6f38a49099d9e5ed1cb51d /libavformat | |
| parent | ab332d013301266e95e9c85ffe878bca2bfaf10d (diff) | |
Enable Matroska muxer
Originally committed as revision 10389 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/allformats.c | 3 | ||||
| -rw-r--r-- | libavformat/allformats.h | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 11fd2cf652..6ccf672e37 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -70,7 +70,9 @@ OBJS-$(CONFIG_INGENIENT_DEMUXER) += raw.o 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 --git a/libavformat/allformats.c b/libavformat/allformats.c index e18063531d..5b5f88f862 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -91,7 +91,8 @@ void av_register_all(void) 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 --git a/libavformat/allformats.h b/libavformat/allformats.h index 4ae01e6e28..d17a146e7c 100644 --- a/libavformat/allformats.h +++ b/libavformat/allformats.h @@ -144,6 +144,8 @@ extern AVOutputFormat image_muxer; 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; |