Merge commit '675ac56b7ee0f204963fde55295197c5df80aa91'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Nov 2014 10:52:33 +0000 (11:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Nov 2014 10:52:33 +0000 (11:52 +0100)
commit4ae1d6021be96dcded093e51d04294075b14e511
tree44fbc8a90455083052c15e2e19ff5c2f42a3221d
parentcc663bd13a97a92a3b3ba838393e77f2e1c490ad
parent675ac56b7ee0f204963fde55295197c5df80aa91
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>
libavformat/dashenc.c
libavformat/hdsenc.c
libavformat/internal.h
libavformat/smoothstreamingenc.c