X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=.mailmap;h=ba072f38c8d4660aa26a3ee5ad8550a9c2bd31d1;hb=036bb53ccc7050aad3f8f309e5650da5840da7ea;hp=f14770d800e7c7d1e780b26116bdcc29d784019a;hpb=157feea0416b41d309820e6595c27428ad04502c;p=ffmpeg

diff --git a/.mailmap b/.mailmap
index f14770d800e..ba072f38c8d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -10,7 +10,8 @@
 <barryjzhao@tencent.com> <jun.zhao@intel.com>
 <josh@itanimul.li> <joshdk@obe.tv>
 <michael@niedermayer.cc> <michaelni@gmx.at>
-<linjie.fu@intel.com> <fulinjie@zju.edu.cn>
+<linjie.justin.fu@gmail.com> <linjie.fu@intel.com>
+<linjie.justin.fu@gmail.com> <fulinjie@zju.edu.cn>
 <ceffmpeg@gmail.com> <cehoyos@ag.or.at>
 <ceffmpeg@gmail.com> <cehoyos@rainbow.studorg.tuwien.ac.at>
 <ffmpeg@gyani.pro> <gyandoshi@gmail.com>
@@ -21,3 +22,4 @@
 rcombs <rcombs@rcombs.me> <rodger.combs@gmail.com>
 <thilo.borgmann@mail.de> <thilo.borgmann@googlemail.com>
 <liuqi05@kuaishou.com> <lq@chinaffmpeg.org>
+<ruiling.song83@gmail.com> <ruiling.song@intel.com>