diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-26 02:26:45 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-26 02:26:45 +0100 |
commit | edb069e55689ebff14e689254ce924a30b7bad94 (patch) | |
tree | 2183c976d0e1658a617e178f6bbb43c80af9ffcc /configure | |
parent | 3b709fd912749d7731fa954cfb3aedd18d8a666a (diff) | |
parent | 3f8f1c6ff24ee858eb5b0bf47ef6d4605299a87e (diff) | |
download | ffmpeg-streaming-edb069e55689ebff14e689254ce924a30b7bad94.zip ffmpeg-streaming-edb069e55689ebff14e689254ce924a30b7bad94.tar.gz |
Merge commit '3f8f1c6ff24ee858eb5b0bf47ef6d4605299a87e'
* commit '3f8f1c6ff24ee858eb5b0bf47ef6d4605299a87e':
lavu: Provide fallbacks for gmtime_r and localtime_r
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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 |