Merge commit '3f8f1c6ff24ee858eb5b0bf47ef6d4605299a87e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Oct 2014 01:26:45 +0000 (02:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Oct 2014 01:26:45 +0000 (02:26 +0100)
commitedb069e55689ebff14e689254ce924a30b7bad94
tree2183c976d0e1658a617e178f6bbb43c80af9ffcc
parent3b709fd912749d7731fa954cfb3aedd18d8a666a
parent3f8f1c6ff24ee858eb5b0bf47ef6d4605299a87e
Merge commit '3f8f1c6ff24ee858eb5b0bf47ef6d4605299a87e'

* commit '3f8f1c6ff24ee858eb5b0bf47ef6d4605299a87e':
  lavu: Provide fallbacks for gmtime_r and localtime_r

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavutil/time_internal.h