# The format of this file was inspired by the Linux kernel CREDITS file.
# Authors are listed alphabetically.
#
-# The fields are: name (N), email (E), web-address (W), CVS account login (C),
+# The fields are: name (N), email (E), web-address (W), SVN account login (C),
# PGP key ID and fingerprint (P), description (D), and snail-mail address (S).
N: Laurent Aimar
S: Germany
N: Olivier Aubert
-E: oaubert at lisi dot univ-lyon1 dot fr
-D: CORBA interface
+E: olivier.aubert at liris dot cnrs dot fr
+D: Mediacontrol API, Python bindings, svg module
S: France
N: Sigmund Augdal Helberg
D: SDL video output
S: France
+N: Filippo Carone
+E: filippo[dontspam]@carone.org
+C: littlejohn
+D: Java bindings
+S: Italy
+
+N: Rafaël "Hanz, David" Carré
+E: funman@videolanorg
+C: funman
+P: C0AFF10F
+D: D-Bus control, Audioscrobbler, Telepathy, Taglib meta reader/writer
+D: Ncurses enhancements, Power management inhibition
+D: PGP update core
+D: Spread bugfixes
+S: Netherlands
+
N: Tony Castley
E: tony@castley.net
C: tcastley
N: Antoine Cellerier
E: dionoea@videolan.org
C: dionoea
-D: Video Filters: mosaic, gradient and edge detection, magnify, rss
-D: Podcast demux
+D: Video Filters: mosaic, gradient and edge detection, magnify, rss, croppadd, erase, extract, gaussianblur, motion detect, puzzle, rotate, bluescreen, alphamask, psychedelic
+D: Demux: podcast, shoutcast
+D: Access: v4l2
+D: HTTP interface pages
+D: Lua (interface, meta fetcher, playlist, ...) modules
S: France
N: Renaud Dartus
D: AC3 decoder
S: France
+N: Rémi Duraffort
+E: ivoire -at- videolan.org
+C: ivoire
+D: sftp access
+D: Improvement of SDL vout and taglib
+D: QA (memory leaks, race conditions)
+S: France
+
N: Cyril Deguet
E: asmax@via.ecp.fr
C: asmax
D: Audio output
D: skins module (X11 port)
D: skins2 module (core and X11 port)
+D: JACK audio output
S: France
N: Rémi Denis-Courmont
-E: rem#videolan.org
+W: www.remlab.net
C: courmisch
-D: SSL/TLS support (core, HTTP server, HTTP input)
-D: VOC files demultiplexer
-S: France
+D: network subsystem
+D: threading subsystem
+D: Demux: RTP receiver, VOC, XA, Standard MIDI files
+D: Codecs: EA ADPCM, MIDI synthesis
+D: TLS and SRTP
+S: Finland
N: Colin Delacroix
-E: colin@zoy.org
+E: colin#zoy.org
C: colin
-D: MacOS X sound support
+D: initial MacOS X port
+S: France
+
+N: Pierre d'Herbemont
+E: pdherbemont#videolan.org
+C: pdherbemont
+D: Mac OS X Framework
+D: LibVLC enhancements
S: France
N: Boris Dorès
C: babal
D: Win32 network input
D: Win32 interface
-D: Headphone channel mixer
+D: Headphone channel mixer, Dolby Surround decoder
+D: Audio output core enhancements
S: France
N: Jean-Marc Dressler
D: Decoder modularization
S: USA
-N: Andrew Flintham
-E: amf@cus.org.uk
-D: text subtitler and font scripts
-S: United Kingdom
-
N: Damien Fouilleul
E: Damien.Fouilleul@laposte.net
C: Quovodis
D: ActiveX control
+D: Safari/Firefox plugin for MacOS X
+D: Direct3D Video output
+D: SSE2 chroma converters
+D: improved MMX chroma converters
S: Ireland
-N: Alexis Guillard
-E: alexis.guillard@bt.com
-D: IPv6 support
-S: United Kingdom
-
-N: Gerald Hansink
-E: gerald.hansink@ordina.nl
-D: Qt Embedded Video Output
-S: Netherlands
-
-N: Shane Harper
-E: shanegh@optusnet.com.au
-D: SDL plugin fixes and enhancements
-D: XVideo video output
-D: Gnome and Gtk+ interface enhancements
-S: United Kingdom
-
N: Derk-Jan Hartman
E: hartman@videolan.org
C: hartman
D: Mac OS X Video Output
D: Mac OS X Audio Output
D: Kasenna client support
+D: contrib system for 3rd party libraries
S: Netherlands
N: Gaël Hendryckx
D: MPEG audio decoder
S: France
-N: Felix Kühne
-E: fkuehne@users.sourceforge.net
+N: Jean-Baptiste Kempf
+E: jb@videolan.org
+C: jb
+D: Qt4 Interface
+D: Contribs system
+S: France
+
+N: Pavlov Konstantin
+E: thresh@videolan.org
+C: thresh
+D: Build system/linkage fixes
+D: Pidfile creation on daemon mode
+D: Parts of Russian translation
+D: ALTLinux VLC maintainer
+S: Russia
+
+N: Felix Paul Kühne
+E: fkuehne@videolan.org
C: fkuehne
-D: MacOS X Interface (Wizard, structure, extended controls panel, bookmarks window)
+D: MacOS X Interface (wizard, structure, extended controls panel, bookmarks window, fullscreen controller)
+D: Interface Interaction (core and OSX)
+D: contrib system for 3rd party libraries
D: German translation
S: Germany
D: DVB input
D: mosaic
D: TS muxer/demuxer improvements
+D: contrib system for 3rd party libraries
D: documentation
+D: fortunes maintainer
S: France
N: Loïc Minier
D: SLP
S: France
+N: Christophe Mutricy
+E: xtophe at videolan d0t org
+C: xtophe
+D: libnotify plugin
+D: contrib system for 3rd party libraries
+D: win32 binary contribs
+D: Varios fixes (configure.ac, wxWidgets, M3U, ...)
+S: England
+
+N: Ilkka Ollakka
+E: ileoo at videolan org
+C: ileoo
+D: x264,qt4 enhancements and fixes
+S: Finland
+
N: Florian G. Pflug
E: fgp@phlo.org
C: fgp
D: MacOS X port
S: Austria
-N: Heiko Panther
-E: heiko.panther@web.de
-D: Mac OS X audio device selection framework
-S: Germany
-
N: Eric Petit
E: titer@videolan.org
C: titer
D: BeOS module fixes and enhancements
D: Stream output
D: Mac OS X OpenGL video output
+D: contrib system for 3rd party libraries
S: France
N: Benjamin Pracht
-E: bigben@videolan.org
+E: bigben+spam@videolan.org
C: bigben
D: MacOS X Interface (playlist)
D: documentation
D: skins module (core and win32 port)
S: France
-N: Frédéric RUGET
-E: frederic.ruget@free.fr
-D: Portaudio audio output
-S: France
-
N: Jean-Paul Saman
E: jp_dot_saman#videolan_dot_nl
D: libmad plug-in
D: DVB-S/C/T on v4l2 API
D: HD1000 port
D: OSD menu
+D: Digital Video (Firewire/IEEE1394/I-Link)
S: Netherlands
N: Arnaud Schauly
D: X11 and GGI video outputs
S: France
+N: Kenneth Self
+E: kens@campoz.fslife.co.uk
+C: kenS
+D: BDA module
+S: United Kingdom
+
N: Richard Shepherd
E: richard@rshepherd.demon.co.uk
C: richards
D: visualisation, volume normalizer
S: France
-N: Peter Surda
-E: shurdeek@panorama.sth.ac.at
-D: rc plugin for VLC control through /dev/stdin
-S: Austria
-
N: Olivier Teulière
E: ipkiss@via.ecp.fr
C: ipkiss