Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
e09f7d61
Commit
e09f7d61
authored
Sep 05, 2007
by
David Conrad
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable Matroska muxer
Originally committed as revision 10389 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
ab332d01
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
2 deletions
+9
-2
Changelog
Changelog
+1
-0
MAINTAINERS
MAINTAINERS
+1
-0
general.texi
doc/general.texi
+1
-1
Makefile
libavformat/Makefile
+2
-0
allformats.c
libavformat/allformats.c
+2
-1
allformats.h
libavformat/allformats.h
+2
-0
No files found.
Changelog
View file @
e09f7d61
...
...
@@ -92,6 +92,7 @@ version <next>
- OS/2 support removed
- AC-3 decoder
- NUT muxer (since r10052)
- Matroska muxer
version 0.4.9-pre1:
...
...
MAINTAINERS
View file @
e09f7d61
...
...
@@ -222,6 +222,7 @@ Muxers/Demuxers:
img2.c Michael Niedermayer
libnut.c Oded Shimon
matroska.c Aurelien Jacobs
matroskaenc.c David Conrad
mov.c Michael Niedermayer, Baptiste Coudurier
movenc.c Michael Niedermayer, Baptiste Coudurier
mpc.c Kostya Shishkov
...
...
doc/general.texi
View file @
e09f7d61
...
...
@@ -85,7 +85,7 @@ library:
@tab Used in Sierra CD-ROM games.
@item Sierra Online @tab @tab X
@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
@tab Used in various EA games; files have extensions like WVE and UV2.
@item Nullsoft Video (NSV) format @tab @tab X
...
...
libavformat/Makefile
View file @
e09f7d61
...
...
@@ -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
...
...
libavformat/allformats.c
View file @
e09f7d61
...
...
@@ -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
);
...
...
libavformat/allformats.h
View file @
e09f7d61
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment