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)
commite427ba5c68a522b26a45bf7c61016d9349fab43d
tree3170613946db9c2c2761abf1ab80c99e1ab906e4
parente645d7a6d452df83cedcbb1d6708429ceea156da
parentc4642788e83b0858bca449f9b6e71ddb015dfa5d
Merge commit 'c4642788e83b0858bca449f9b6e71ddb015dfa5d'

* commit 'c4642788e83b0858bca449f9b6e71ddb015dfa5d':
  time_internal: Prefix fallback versions of gmtime_r/localtime_r with ff_

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