avfilter/vf_showinfo: add dump_s12m_timecode() helper function

[ffmpeg] / .mailmap

diff --git a/.mailmap b/.mailmap
index 50b8c04526779cc9084156fcee7281c1dcc37609..f14770d800e7c7d1e780b26116bdcc29d784019a 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -15,7 +15,9 @@
 <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>