diff options
| author | Mike Melanson <mike@multimedia.cx> | 2004-03-13 16:35:32 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2004-03-13 16:35:32 +0000 |
| commit | 38088adf638f42c7c35a17c181b4cc60d55dcb9a (patch) | |
| tree | 8fbef6f36b769b48c26f1996e3dba1e46df7dbc1 | |
| parent | e7a18d5debc40d39e842d7b7bd1f57ab886c47b9 (diff) | |
| download | ffmpeg-38088adf638f42c7c35a17c181b4cc60d55dcb9a.tar.gz | |
Matroska credits
Originally committed as revision 2875 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | CREDITS | 3 | ||||
| -rw-r--r-- | doc/ffmpeg-doc.texi | 1 |
2 files changed, 3 insertions, 1 deletions
@@ -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 61af32cf2e..849b93a23c 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. |