summaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2004-03-13 16:35:32 +0000
committerMike Melanson <mike@multimedia.cx>2004-03-13 16:35:32 +0000
commit38088adf638f42c7c35a17c181b4cc60d55dcb9a (patch)
tree8fbef6f36b769b48c26f1996e3dba1e46df7dbc1 /CREDITS
parente7a18d5debc40d39e842d7b7bd1f57ab886c47b9 (diff)
downloadffmpeg-streaming-38088adf638f42c7c35a17c181b4cc60d55dcb9a.zip
ffmpeg-streaming-38088adf638f42c7c35a17c181b4cc60d55dcb9a.tar.gz
Matroska credits
Originally committed as revision 2875 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS3
1 files changed, 2 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
OpenPOWER on IntegriCloud