* commit '82ee7d0d':
  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@gmx.at>