contrib: ffmpeg: only use libvpx when building encoders

[vlc] / .mailmap

diff --git a/.mailmap b/.mailmap
index ff2f6ce1cc24eeee343c0ed1c077d0abfbf59c1a..6ad2b54f0e848449cc141ca07b8459571d8eabe3 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -75,13 +75,22 @@ Nicolas Chauvet <kwizart@gmail.com>
 Rob Jonson <rob@hobbyistsoftware.com>
 Sigmund Augdal Helberg <sigmunau@videolan.org>
 Vincent Penquerc'h <ogg.k.ogg.k@googlemail.com>
-Anthony Loiseau <thannoy@actech-innovation.com>
+Anthony Loiseau <anthony.loiseau@gmail.com> <thannoy@actech-innovation.com>
 FUJISAWA Tooru <arai_a@mac.com>
 Ken Self <kenself@optusnet.com.au>
 Tony Gaillard <tony.gaillard@supinfo.com> <Tony.GAILLARD@supinfo.com>
 Przemyslaw Fiala <bl4@playker.info>
+Marián Hikaník <podnety@mojepreklady.net>
+Michael McEll <mapei_@hotmail.com>
+Marian Ďurkovič <md@bts.sk>
+Dylan Yudaken <dyudaken@gmail.com>
+Martin T. H. Sandsmark <sandsmark@samfundet.no>
+<cyril.mathe@gmail.com> <cmathe@actech-innovation.com>
+<riquedafreak@videolan.org> <enrique.osuna@gmail.com>
+<nib9@charter.net> <zaggal69@gmail.com>
 #
 # Preferred emails
-<malte@tancred.com.> <malte@frontbase.com>
+<malte@tancred.com> <malte@frontbase.com>
 <xtophe@videolan.org> <xtophe@chewa.net>
 <hartman@videolan.org> <hartman@veda.student.utwente.nl>
+<etix@videolan.org> <etix@l0cal.com>