summaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-09-25 10:47:30 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-09-25 10:47:30 +0000
commitbc133816c03b32d722fa43cfe1d199a273fc65b4 (patch)
tree3ddf5f736018c8eb35e78a5a001a45625d8bdcc4 /CREDITS
parent792bb815e38224b8d7f1f1d3d2af1849a689ac87 (diff)
downloadffmpeg-streaming-bc133816c03b32d722fa43cfe1d199a273fc65b4.zip
ffmpeg-streaming-bc133816c03b32d722fa43cfe1d199a273fc65b4.tar.gz
some credits for all these patches
Originally committed as revision 3506 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS1
1 files changed, 1 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index 3296099..0cbd4d6 100644
--- a/CREDITS
+++ b/CREDITS
@@ -19,6 +19,7 @@ Robin Kay
Todd Kirby
Nick Kurshev
Mike Melanson
+Loren Merritt
Michael Niedermayer
François Revol
Roman Shaposhnik
OpenPOWER on IntegriCloud