[FFmpeg-cvslog] mailmap: fix 3-address entries
rcombs
git at videolan.org
Tue Mar 31 12:14:27 EEST 2020
ffmpeg | branch: master | rcombs <rcombs at rcombs.me> | Tue Mar 31 04:13:08 2020 -0500| [fa164bc50e3400fbddf94bcafbfe33e2ce9ab24b] | committer: rcombs
mailmap: fix 3-address entries
git only supports <new> <old>, not <new> <old1> <old2>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa164bc50e3400fbddf94bcafbfe33e2ce9ab24b
---
.mailmap | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/.mailmap b/.mailmap
index 330cdd13dc..50b8c04526 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,14 +2,17 @@
<jeebjp at gmail.com> <jan.ekstrom at aminocom.com>
<sw at jkqxz.net> <mrt at jkqxz.net>
<u at pkh.me> <cboesch at gopro.com>
-<zhilizhao at tencent.com> <quinkblack at foxmail.com> <wantlamy at gmail.com>
+<zhilizhao at tencent.com> <quinkblack at foxmail.com>
+<zhilizhao at tencent.com> <wantlamy at gmail.com>
<modmaker at google.com> <modmaker-at-google.com at ffmpeg.org>
<stebbins at jetheaddev.com> <jstebbins at jetheaddev.com>
-<barryjzhao at tencent.com> <mypopydev at gmail.com> <jun.zhao at intel.com>
+<barryjzhao at tencent.com> <mypopydev at gmail.com>
+<barryjzhao at tencent.com> <jun.zhao at intel.com>
<josh at itanimul.li> <joshdk at obe.tv>
<michael at niedermayer.cc> <michaelni at gmx.at>
<linjie.fu at intel.com> <fulinjie at zju.edu.cn>
-<ceffmpeg at gmail.com> <cehoyos at ag.or.at> <cehoyos at rainbow.studorg.tuwien.ac.at>
+<ceffmpeg at gmail.com> <cehoyos at ag.or.at>
+<ceffmpeg at gmail.com> <cehoyos at rainbow.studorg.tuwien.ac.at>
<ffmpeg at gyani.pro> <gyandoshi at gmail.com>
<atomnuker at gmail.com> <rpehlivanov at obe.tv>
<zhong.li at intel.com> <zhongli_dev at 126.com>
More information about the ffmpeg-cvslog
mailing list