[FFmpeg-cvslog] Merge commit '82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de'

[Michael Niedermayer]

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

Merge commit '82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de'

* commit '82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de':
  Use gmtime_r instead of gmtime and localtime_r instead of localtime

Conflicts:
	libavformat/mov.c
	libavformat/mxfenc.c
	libavformat/wtvdec.c
	libavutil/parseutils.c

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

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