merge decl & init

[ffmpeg] / CREDITS

diff --git a/CREDITS b/CREDITS
index f7f086a3cfa0a180b51229d7d1dc2205e76c4866..dd328c65c6500073ee22684cd0ad6c9107444969 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -1,6 +1,7 @@
 This file contains the name of the people who have contributed to
 FFmpeg. The names are sorted alphabetically by last name.
 
+Dénes Balatoni
 Michel Bardiaux
 Fabrice Bellard
 Patrice Bensoussan
@@ -18,6 +19,7 @@ Vladimir Gneushev
 Roine Gustafsson
 David Hammerton
 Wolfgang Hesseler
+Marc Hoffman
 Falk Hueffner
 Steven Johnson
 Zdenek Kabelac