]> git.sesse.net Git - ffmpeg/commitdiff
mailmap: fix 3-address entries
authorrcombs <rcombs@rcombs.me>
Tue, 31 Mar 2020 09:13:08 +0000 (04:13 -0500)
committerrcombs <rcombs@rcombs.me>
Tue, 31 Mar 2020 09:14:14 +0000 (04:14 -0500)
git only supports <new> <old>, not <new> <old1> <old2>

.mailmap

index 330cdd13dca8385bb5a587f6cdeebd1af71de8d4..50b8c04526779cc9084156fcee7281c1dcc37609 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -2,14 +2,17 @@
 <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>
-<ceffmpeg@gmail.com> <cehoyos@ag.or.at> <cehoyos@rainbow.studorg.tuwien.ac.at>
+<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>