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)
commit3d6545d51e6c031a77b0abf7470c681034dd8193
treec08af2c4aa65e0197a20258c4206993a052acd6b
parenta701a9cff4d53791ff811ebeaf1a644fca74191c
parent8ebf02f8f530240edf7e45f35f7647ef9dd44a58
Merge commit '8ebf02f8f530240edf7e45f35f7647ef9dd44a58'

* commit '8ebf02f8f530240edf7e45f35f7647ef9dd44a58':
  libavformat: Only use MoveFileExA when targeting the desktop API subset

Conflicts:
configure

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