Michael Niedermayer 4ae1d6021b 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@gmx.at>

2014-11-27 11:52:33 +01:00

22 KiB

Raw Blame History

View Raw