flac: STREAMINFO is not necessarily the first METADATA_BLOCK

[vlc] / .mailmap

diff --git a/.mailmap b/.mailmap
index 8e37fdad1d09b33aa364b2c93289f67ace159ebd..717463ef204f44114e68eb9bd883668bb48b8cc6 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -71,7 +71,8 @@ Brad Smith <brad@comstyle.com>
 <cristi@secarica.ro> <cristi.secarica.ro>
 <davidf@rd.bbc.co.uk> <davidf+nntp@woaf.net>
 <davidf@rd.bbc.co.uk> <davidf@woaf.net>
-Hugo Beauzée-Luyssen <beauze.h@gmail.com>
+Hugo Beauzée-Luyssen <hugo@beauzee.fr>
+<hugo@beauzee.fr> <beauze.h@gmail.com>
 <markfm@videolan.org> <mfmbusiness@earthlink.net>
 <markfm@videolan.org> <mfmori@hotmail.com>
 Nicolas Chauvet <kwizart@gmail.com>
@@ -111,7 +112,7 @@ Jérôme Decoodt <djc@videolan.org>
 Jérôme Decoodt <djc@videolan.org> Jérôme Decoodt <djc+git@videolan.org>
 Matej Urban <matej.urban@gmail.com> Matej Urbančič <mateju@svn.gnome.org>
 Xabier Aramendi <azpidatziak@gmail.com>
-Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
+Gwenole Beauchesne <gb.devel@gmail.com> <gbeauchesne@splitted-desktop.com>
 Frédéric Yhuel <fyhuel@viotech.net>
 Ming Hu <tewilove@gmail.com>
 Kuan-Chung Chiu <buganini@gmail.com>
@@ -131,3 +132,5 @@ Rui Zhang <bbcallen@gmail.com>
 <xtophe@videolan.org> <xtophe@chewa.net>
 <hartman@videolan.org> <hartman@veda.student.utwente.nl>
 <etix@videolan.org> <etix@l0cal.com>
+<steven@m20.nl> <skramer@inbeeld.eu>
+<jarmo.torvinen@iki.fi> <jarmo.torvinen@jutel.fi>