[FFmpeg-cvslog] Merge commit '79fd186a5035cf16fc0ab288d8f59da8b1ba2c0e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 27 11:35:54 2014 +0100| [cc663bd13a97a92a3b3ba838393e77f2e1c490ad] | committer: Michael Niedermayer

Merge commit '79fd186a5035cf16fc0ab288d8f59da8b1ba2c0e'

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

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cc663bd13a97a92a3b3ba838393e77f2e1c490ad
---