[FFmpeg-cvslog] Merge commit '9485cce6d55baf547e92ef1f54cad117f2a38287'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu May  2 13:48:43 2019 -0300| [e645d7a6d452df83cedcbb1d6708429ceea156da] | committer: James Almer

Merge commit '9485cce6d55baf547e92ef1f54cad117f2a38287'

* commit '9485cce6d55baf547e92ef1f54cad117f2a38287':
  time_internal: Do not attempt to override *time_r() macros

This commit is a noop, see a604de4fd89e8fe37d2f8163282060fcaa64ee3e

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e645d7a6d452df83cedcbb1d6708429ceea156da
---