> On Jun 17, 2020, at 12:16, Josh de Kock <j...@itanimul.li> wrote: > > On 17/06/2020 15:16, Zhong Li wrote: >> Signed-off-by: Zhong Li <zhongli_...@126.com> >> --- >> .mailmap | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> diff --git a/.mailmap b/.mailmap >> index d1925bfab0..f14770d800 100644 >> --- a/.mailmap >> +++ b/.mailmap >> @@ -15,7 +15,8 @@ >> <ceffm...@gmail.com> <ceho...@rainbow.studorg.tuwien.ac.at> >> <ffm...@gyani.pro> <gyando...@gmail.com> >> <atomnu...@gmail.com> <rpehliva...@obe.tv> >> -<zhong...@intel.com> <zhongli_...@126.com> >> +<lizhong1...@gmail.com> <zhong...@intel.com> >> +<lizhong1...@gmail.com> <zhongli_...@126.com> > <lizhong1...@gmail.com> <zhongli_...@126.com> <zhong...@intel.com> > > Is better if you would like the last two emails to be displayed as > lizhong1...@gmail.com.
No, you can't have 2 old addresses on a single line. You need a separate line for each one. >> <andreas.rheinha...@gmail.com> <andreas.rheinha...@googlemail.com> >> rcombs <rco...@rcombs.me> <rodger.co...@gmail.com> >> <thilo.borgm...@mail.de> <thilo.borgm...@googlemail.com> > -- > Josh > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
