summaryrefslogtreecommitdiff
authorGuillaume Poirier <gpoirier@mplayerhq.hu>2007-06-13 18:48:39 (GMT)
committer Guillaume Poirier <gpoirier@mplayerhq.hu>2007-06-13 18:48:39 (GMT)
commit2ef7c6350b3751d8b796fdf6e830dfb327754450 (patch)
tree68de02bd172edd91e70dc42a9410ec064011cd4e
parent86bdf3fd3de22e1ae9273f1d487ca5ed5118b81f (diff)
downloadffmpeg-2ef7c6350b3751d8b796fdf6e830dfb327754450.zip
ffmpeg-2ef7c6350b3751d8b796fdf6e830dfb327754450.tar.gz
ffmpeg-2ef7c6350b3751d8b796fdf6e830dfb327754450.tar.bz2
List myself in CREDITS as I did have some of code committed,
Add myself to PPC/OSX maintainers as this what I've been doing for several month already, and Romain isn't active that much these days Originally committed as revision 9304 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat
-rw-r--r--CREDITS1
-rw-r--r--MAINTAINERS2
2 files changed, 2 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index f7f086a..cd46d79 100644
--- a/CREDITS
+++ b/CREDITS
@@ -31,6 +31,7 @@ Mike Melanson
Loren Merritt
Jeff Muizelaar
Michael Niedermayer
+Guillaume Poirier
François Revol
Peter Ross
Måns Rullgård
diff --git a/MAINTAINERS b/MAINTAINERS
index 2549ff5..228a3e2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -253,7 +253,7 @@ Operating systems / CPU architectures
Alpha Mans Rullgard, Falk Hueffner
BeOS Francois Revol
i386 Michael Niedermayer
-Mac OS X / PowerPC Romain Dolbeau
+Mac OS X / PowerPC Romain Dolbeau, Guillaume Poirier
Amiga / PowerPC Colin Ward
Linux / PowerPC Luca Barbato
Windows MinGW Alex Beregszaszi