Merge commit 'c4642788e83b0858bca449f9b6e71ddb015dfa5d'
authorJames Almer <jamrial@gmail.com>
Thu, 2 May 2019 16:50:31 +0000 (13:50 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 2 May 2019 16:50:31 +0000 (13:50 -0300)
* commit 'c4642788e83b0858bca449f9b6e71ddb015dfa5d':
  time_internal: Prefix fallback versions of gmtime_r/localtime_r with ff_

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavutil/time_internal.h

Simple merge