From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 26 Oct 2014 01:26:45 +0000 (+0100)
Subject: Merge commit '3f8f1c6ff24ee858eb5b0bf47ef6d4605299a87e'
X-Git-Tag: n2.5~785
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/edb069e55689ebff14e689254ce924a30b7bad94

Merge commit '3f8f1c6ff24ee858eb5b0bf47ef6d4605299a87e'

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

Conflicts:
	configure

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

edb069e55689ebff14e689254ce924a30b7bad94
diff --cc configure
index 3eb1aa08a1,f53332d916..bb9ba8bfa3
--- a/configure
+++ b/configure
@@@ -1712,8 -1453,7 +1712,9 @@@ SYSTEM_FUNCS=
      getservbyport
      GetSystemTimeAsFileTime
      gettimeofday
 +    glob
 +    glXGetProcAddress
+     gmtime_r
      inet_aton
      isatty
      jack_port_get_latency_range
diff --cc libavutil/time_internal.h
index 0000000000,829fefb007..c19cc5f73d
mode 000000,100644..100644
--- a/libavutil/time_internal.h
+++ b/libavutil/time_internal.h
@@@ -1,0 -1,47 +1,47 @@@
+ /*
 - * This file is part of Libav.
++ * This file is part of FFmpeg.
+  *
 - * Libav is free software; you can redistribute it and/or
++ * FFmpeg is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+  * License as published by the Free Software Foundation; either
+  * version 2.1 of the License, or (at your option) any later version.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * FFmpeg is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
++ * License along with FFmpeg; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+ #ifndef AVUTIL_TIME_INTERNAL_H
+ #define AVUTIL_TIME_INTERNAL_H
+ 
+ #include <time.h>
+ #include "config.h"
+ 
+ #if !HAVE_GMTIME_R
+ static inline struct tm *gmtime_r(const time_t* clock, struct tm *result)
+ {
+     struct tm *ptr = gmtime(clock);
+     if (!ptr)
+         return NULL;
+     *result = *ptr;
+     return result;
+ }
+ #endif
+ 
+ #if !HAVE_LOCALTIME_R
+ static inline struct tm *localtime_r(const time_t* clock, struct tm *result)
+ {
+     struct tm *ptr = localtime(clock);
+     if (!ptr)
+         return NULL;
+     *result = *ptr;
+     return result;
+ }
+ #endif
+ 
+ #endif /* AVUTIL_TIME_INTERNAL_H */