diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-27 11:35:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-27 11:35:54 +0100 |
| commit | cc663bd13a97a92a3b3ba838393e77f2e1c490ad (patch) | |
| tree | 64548f2cbc0ba8461b3ea7e3ea9c0ab63976c94f /configure | |
| parent | 097de4d1d68fb5aef5fc8881b2afc65db3f0dac0 (diff) | |
| parent | 79fd186a5035cf16fc0ab288d8f59da8b1ba2c0e (diff) | |
| download | ffmpeg-streaming-cc663bd13a97a92a3b3ba838393e77f2e1c490ad.zip ffmpeg-streaming-cc663bd13a97a92a3b3ba838393e77f2e1c490ad.tar.gz | |
Merge commit '79fd186a5035cf16fc0ab288d8f59da8b1ba2c0e'
* commit '79fd186a5035cf16fc0ab288d8f59da8b1ba2c0e':
lavf: Use MoveFileEx instead of rename/_wrename on windows
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
@@ -1732,6 +1732,7 @@ SYSTEM_FUNCS=" lzo1x_999_compress mach_absolute_time MapViewOfFile + MoveFileExA memalign mkstemp mmap @@ -4736,6 +4737,7 @@ check_func_headers windows.h GetProcessAffinityMask check_func_headers windows.h GetProcessTimes check_func_headers windows.h GetSystemTimeAsFileTime check_func_headers windows.h MapViewOfFile +check_func_headers windows.h MoveFileExA check_func_headers windows.h PeekNamedPipe check_func_headers windows.h SetConsoleTextAttribute check_func_headers windows.h Sleep |
