summaryrefslogtreecommitdiff
authorMike Melanson <mike@multimedia.cx>2004-03-13 16:35:32 (GMT)
committer Mike Melanson <mike@multimedia.cx>2004-03-13 16:35:32 (GMT)
commit38088adf638f42c7c35a17c181b4cc60d55dcb9a (patch)
tree8fbef6f36b769b48c26f1996e3dba1e46df7dbc1
parente7a18d5debc40d39e842d7b7bd1f57ab886c47b9 (diff)
downloadffmpeg-38088adf638f42c7c35a17c181b4cc60d55dcb9a.zip
ffmpeg-38088adf638f42c7c35a17c181b4cc60d55dcb9a.tar.gz
ffmpeg-38088adf638f42c7c35a17c181b4cc60d55dcb9a.tar.bz2
Matroska credits
Originally committed as revision 2875 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat
-rw-r--r--CREDITS3
-rw-r--r--doc/ffmpeg-doc.texi1
2 files changed, 3 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index fe6cfcb..ce76154 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2,9 +2,10 @@ This file contains the name of the people who have contributed to
ffmpeg. The names are sorted alphabetically.
Fabrice Bellard
+Alex Beregszaszi
BERO
Mario Brito
-Alex Beregszaszi
+Ronald Bultje
Tim Ferguson
Brian Foley
Arpad Gereoffy
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 61af32c..849b93a 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -659,6 +659,7 @@ library:
@tab .fli/.flc files
@item Sierra VMD @tab @tab X
@tab used in Sierra CD-ROM games
+@item Matroska @tab @tab X
@end multitable
@code{X} means that the encoding (resp. decoding) is supported.