RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '3f8f1c6ff24ee858eb5b0bf47ef6d4605299a87e' 

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

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-26 02:26:45 +01:00
parent 3b709fd912 3f8f1c6ff2
commit edb069e556
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -1714,6 +1714,7 @@ SYSTEM_FUNCS="
gettimeofday
glob
glXGetProcAddress
gmtime_r
inet_aton
isatty
jack_port_get_latency_range
@ -4690,6 +4691,7 @@ check_func gethrtime
check_func getopt
check_func getrusage
check_func gettimeofday
check_func gmtime_r
check_func isatty
check_func localtime_r
check_func mach_absolute_time

47
libavutil/time_internal.h Normal file
View File

@ -0,0 +1,47 @@
/*
* This file is part of FFmpeg.
*
* 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.
*
* 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 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 */