X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=.mailmap;h=ba072f38c8d4660aa26a3ee5ad8550a9c2bd31d1;hb=ea2d9b7a2e02861ea680f91404414955f55a294c;hp=59819a14531525bb50cfecb380f89434d0792547;hpb=b870a6bffa914ec63a5c08a66bde69f604c5dfb1;p=ffmpeg

diff --git a/.mailmap b/.mailmap
index 59819a14531..ba072f38c8d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,17 +2,24 @@
 <jeebjp@gmail.com> <jan.ekstrom@aminocom.com>
 <sw@jkqxz.net> <mrt@jkqxz.net>
 <u@pkh.me> <cboesch@gopro.com>
-<zhilizhao@tencent.com> <quinkblack@foxmail.com> <wantlamy@gmail.com>
+<zhilizhao@tencent.com> <quinkblack@foxmail.com>
+<zhilizhao@tencent.com> <wantlamy@gmail.com>
 <modmaker@google.com> <modmaker-at-google.com@ffmpeg.org>
 <stebbins@jetheaddev.com> <jstebbins@jetheaddev.com>
-<barryjzhao@tencent.com> <mypopydev@gmail.com> <jun.zhao@intel.com>
+<barryjzhao@tencent.com> <mypopydev@gmail.com>
+<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>
 <atomnuker@gmail.com> <rpehlivanov@obe.tv>
-<zhong.li@intel.com> <zhongli_dev@126.com>
+<lizhong1008@gmail.com> <zhong.li@intel.com>
+<lizhong1008@gmail.com> <zhongli_dev@126.com>
 <andreas.rheinhardt@gmail.com> <andreas.rheinhardt@googlemail.com>
 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>