RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-03 13:32:10 +00:00
Code Issues Projects Releases Wiki Activity

Enable Matroska muxer

Browse Source 
Originally committed as revision 10389 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad 2007-09-05 00:38:42 +00:00
parent ab332d0133
commit e09f7d61da
6 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -92,6 +92,7 @@ version <next>
- OS/2 support removed - OS/2 support removed
- AC-3 decoder - AC-3 decoder
- NUT muxer (since r10052) - NUT muxer (since r10052)
- Matroska muxer
version 0.4.9-pre1: version 0.4.9-pre1:

1
MAINTAINERS
View File

@ -222,6 +222,7 @@ Muxers/Demuxers:
img2.c Michael Niedermayer img2.c Michael Niedermayer
libnut.c Oded Shimon libnut.c Oded Shimon
matroska.c Aurelien Jacobs matroska.c Aurelien Jacobs
matroskaenc.c David Conrad
mov.c Michael Niedermayer, Baptiste Coudurier mov.c Michael Niedermayer, Baptiste Coudurier
movenc.c Michael Niedermayer, Baptiste Coudurier movenc.c Michael Niedermayer, Baptiste Coudurier
mpc.c Kostya Shishkov mpc.c Kostya Shishkov

2
doc/general.texi
View File

@ -85,7 +85,7 @@ library:
@tab Used in Sierra CD-ROM games. @tab Used in Sierra CD-ROM games.
@item Sierra Online @tab @tab X @item Sierra Online @tab @tab X
@tab .sol files used in Sierra Online games. @tab .sol files used in Sierra Online games.
@item Matroska @tab @tab X @item Matroska @tab X @tab X
@item Electronic Arts Multimedia @tab @tab X @item Electronic Arts Multimedia @tab @tab X
@tab Used in various EA games; files have extensions like WVE and UV2. @tab Used in various EA games; files have extensions like WVE and UV2.
@item Nullsoft Video (NSV) format @tab @tab X @item Nullsoft Video (NSV) format @tab @tab X

2
libavformat/Makefile
View File

@ -70,7 +70,9 @@ OBJS-$(CONFIG_INGENIENT_DEMUXER) += raw.o
OBJS-$(CONFIG_IPMOVIE_DEMUXER) += ipmovie.o OBJS-$(CONFIG_IPMOVIE_DEMUXER) += ipmovie.o
OBJS-$(CONFIG_M4V_DEMUXER) += raw.o OBJS-$(CONFIG_M4V_DEMUXER) += raw.o
OBJS-$(CONFIG_M4V_MUXER) += 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_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_DEMUXER) += raw.o
OBJS-$(CONFIG_MJPEG_MUXER) += raw.o OBJS-$(CONFIG_MJPEG_MUXER) += raw.o
OBJS-$(CONFIG_MM_DEMUXER) += mm.o OBJS-$(CONFIG_MM_DEMUXER) += mm.o

3
libavformat/allformats.c
View File

@ -91,7 +91,8 @@ void av_register_all(void)
if (!ENABLE_NUT_DEMUXER) REGISTER_DEMUXER (LIBNUT, libnut); if (!ENABLE_NUT_DEMUXER) REGISTER_DEMUXER (LIBNUT, libnut);
if (!ENABLE_NUT_MUXER) REGISTER_MUXER (LIBNUT, libnut); if (!ENABLE_NUT_MUXER) REGISTER_MUXER (LIBNUT, libnut);
REGISTER_MUXDEMUX(M4V, m4v); REGISTER_MUXDEMUX(M4V, m4v);
REGISTER_DEMUXER (MATROSKA, matroska); REGISTER_MUXDEMUX(MATROSKA, matroska);
REGISTER_MUXER (MATROSKA_AUDIO, matroska_audio);
REGISTER_MUXDEMUX(MJPEG, mjpeg); REGISTER_MUXDEMUX(MJPEG, mjpeg);
REGISTER_DEMUXER (MM, mm); REGISTER_DEMUXER (MM, mm);
REGISTER_MUXDEMUX(MMF, mmf); REGISTER_MUXDEMUX(MMF, mmf);

2
libavformat/allformats.h
View File

@ -144,6 +144,8 @@ extern AVOutputFormat image_muxer;
extern AVOutputFormat imagepipe_muxer; extern AVOutputFormat imagepipe_muxer;
extern AVOutputFormat libnut_muxer; extern AVOutputFormat libnut_muxer;
extern AVOutputFormat m4v_muxer; extern AVOutputFormat m4v_muxer;
extern AVOutputFormat matroska_audio_muxer;
extern AVOutputFormat matroska_muxer;
extern AVOutputFormat mjpeg_muxer; extern AVOutputFormat mjpeg_muxer;
extern AVOutputFormat mmf_muxer; extern AVOutputFormat mmf_muxer;
extern AVOutputFormat mov_muxer; extern AVOutputFormat mov_muxer;