Merge commit '79fd186a5035cf16fc0ab288d8f59da8b1ba2c0e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Nov 2014 10:35:54 +0000 (11:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Nov 2014 10:35:54 +0000 (11:35 +0100)
* commit '79fd186a5035cf16fc0ab288d8f59da8b1ba2c0e':
  lavf: Use MoveFileEx instead of rename/_wrename on windows

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavformat/os_support.h

diff --cc configure
+++ b/configure
@@@ -1727,11 -1463,10 +1727,12 @@@ SYSTEM_FUNCS=
      inet_aton
      isatty
      jack_port_get_latency_range
 +    kbhit
      localtime_r
 +    lzo1x_999_compress
      mach_absolute_time
      MapViewOfFile
+     MoveFileExA
      memalign
      mkstemp
      mmap
@@@ -4736,7 -4097,7 +4737,8 @@@ check_func_headers windows.h GetProcess
  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
  check_func_headers windows.h VirtualAlloc
Simple merge