aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhao Zhili <zhilizhao@tencent.com>2023-11-02 11:01:45 +0800
committerZhao Zhili <zhilizhao@tencent.com>2023-11-03 20:57:49 +0800
commite920a8480185ff9112b2369a8f3418fa5d0ce5f0 (patch)
tree3ed555bbc389fe98464b757122ac26a773ee86c9
parent9dd49c8b52c3f6f5a486764fce42ec5d5fac8d16 (diff)
downloadffmpeg-e920a8480185ff9112b2369a8f3418fa5d0ce5f0.tar.gz
mailmap: remap my email accounts
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
-rw-r--r--.mailmap4
1 files changed, 2 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index af60290f77..7546cf0caf 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,8 +1,8 @@
<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>
-<zhilizhao@tencent.com> <wantlamy@gmail.com>
+<quinkblack@foxmail.com> <wantlamy@gmail.com>
+<quinkblack@foxmail.com> <zhilizhao@tencent.com>
<modmaker@google.com> <modmaker-at-google.com@ffmpeg.org>
<stebbins@jetheaddev.com> <jstebbins@jetheaddev.com>
<barryjzhao@tencent.com> <mypopydev@gmail.com>