Merge commit 'b9d08c77a44390b0848c06f20bc0e9e951ba6a3c'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 01:14:15 +0000 (02:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 01:14:15 +0000 (02:14 +0100)
commit71ecfcf2d31e4f906f52c3450f4fb46c5087f50e
tree2b1e8944703b072c4ce61b751147e912a08480ed
parentb83beb131f0d3fdb2d472665f5325f02aeac7d7e
parentb9d08c77a44390b0848c06f20bc0e9e951ba6a3c
Merge commit 'b9d08c77a44390b0848c06f20bc0e9e951ba6a3c'

* commit 'b9d08c77a44390b0848c06f20bc0e9e951ba6a3c':
  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