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)
commitcc663bd13a97a92a3b3ba838393e77f2e1c490ad
tree64548f2cbc0ba8461b3ea7e3ea9c0ab63976c94f
parent097de4d1d68fb5aef5fc8881b2afc65db3f0dac0
parent79fd186a5035cf16fc0ab288d8f59da8b1ba2c0e
Merge commit '79fd186a5035cf16fc0ab288d8f59da8b1ba2c0e'

* commit '79fd186a5035cf16fc0ab288d8f59da8b1ba2c0e':
  lavf: Use MoveFileEx instead of rename/_wrename on windows

Conflicts:
configure

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