[FFmpeg-cvslog] Merge commit '3f8f1c6ff24ee858eb5b0bf47ef6d4605299a87e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 26 02:26:45 2014 +0100| [edb069e55689ebff14e689254ce924a30b7bad94] | committer: Michael Niedermayer

Merge commit '3f8f1c6ff24ee858eb5b0bf47ef6d4605299a87e'

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

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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