Michael Niedermayer 4a39d4c65a 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@gmx.at>

2014-10-26 02:38:26 +01:00

28 KiB

Raw Blame History

View Raw