[FFmpeg-cvslog] Merge commit '675ac56b7ee0f204963fde55295197c5df80aa91'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 27 11:52:33 2014 +0100| [4ae1d6021be96dcded093e51d04294075b14e511] | committer: Michael Niedermayer

Merge commit '675ac56b7ee0f204963fde55295197c5df80aa91'

* commit '675ac56b7ee0f204963fde55295197c5df80aa91':
  Revert "lavf: Don't try to update files atomically with renames on windows"

Conflicts:
	libavformat/dashenc.c
	libavformat/hdsenc.c
	libavformat/internal.h
	libavformat/smoothstreamingenc.c

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

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