index
:
ffmpeg
master
oldabi
release/0.10
release/0.11
release/0.5
release/0.6
release/0.7
release/0.8
release/0.9
release/1.0
release/1.1
release/1.2
release/2.0
release/2.1
release/2.2
release/2.3
release/2.4
release/2.5
release/2.6
release/2.7
release/2.8
release/3.0
release/3.1
release/3.2
release/3.3
release/3.4
release/4.0
release/4.1
release/4.2
release/4.3
release/4.4
release/5.0
release/5.1
release/6.0
Mirror of FFmpeg git repo
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
diff options
context:
1
2
3
4
5
6
7
8
9
10
15
20
25
30
35
40
space:
include
ignore
mode:
unified
ssdiff
stat only
Diffstat
-rw-r--r--
CREDITS
1
1 files changed, 1 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index 32960999b1..0cbd4d6033 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