Merge commit '8ebf02f8f530240edf7e45f35f7647ef9dd44a58'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 23:49:12 +0000 (00:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 23:49:47 +0000 (00:49 +0100)
* commit '8ebf02f8f530240edf7e45f35f7647ef9dd44a58':
  libavformat: Only use MoveFileExA when targeting the desktop API subset

Conflicts:
configure

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

diff --cc configure
index 33280261e9f29bf57fed5e0b2a3df26478618b0b,48669a0e27d7bb76521c2c8835be3d89ba445677..87be058fd3dd4a5aaa6515fe951885452103d26d
+++ b/configure
@@@ -1736,12 -1463,9 +1736,11 @@@ SYSTEM_FUNCS=
      inet_aton
      isatty
      jack_port_get_latency_range
 +    kbhit
      localtime_r
 +    lzo1x_999_compress
      mach_absolute_time
      MapViewOfFile
-     MoveFileExA
      memalign
      mkstemp
      mmap
@@@ -4759,8 -4099,6 +4758,7 @@@ 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