From 38088adf638f42c7c35a17c181b4cc60d55dcb9a Mon Sep 17 00:00:00 2001
From: Mike Melanson <mike@multimedia.cx>
Date: Sat, 13 Mar 2004 16:35:32 +0000
Subject: [PATCH] Matroska credits

Originally committed as revision 2875 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 CREDITS             | 3 ++-
 doc/ffmpeg-doc.texi | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CREDITS b/CREDITS
index fe6cfcb22f..ce76154703 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 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.