Merge commit '82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Oct 2014 01:38:26 +0000 (02:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Oct 2014 01:38:26 +0000 (02:38 +0100)
commit4a39d4c65a72860873daa433eab077ffcff0f913
tree62a159e840174773f7ca5927066bd4c2c507a0de
parentedb069e55689ebff14e689254ce924a30b7bad94
parent82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de
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>
libavformat/mov.c
libavformat/mxfenc.c
libavformat/wtvdec.c
libavutil/parseutils.c