diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-25 02:14:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-25 02:14:15 +0100 |
| commit | 71ecfcf2d31e4f906f52c3450f4fb46c5087f50e (patch) | |
| tree | 2b1e8944703b072c4ce61b751147e912a08480ed /libavformat/internal.h | |
| parent | b83beb131f0d3fdb2d472665f5325f02aeac7d7e (diff) | |
| parent | b9d08c77a44390b0848c06f20bc0e9e951ba6a3c (diff) | |
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>
Diffstat (limited to 'libavformat/internal.h')
| -rw-r--r-- | libavformat/internal.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index f7a79dd8d7..180b474ced 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -435,4 +435,10 @@ enum AVWriteUncodedFrameFlags { */ int ff_copy_whitelists(AVFormatContext *dst, AVFormatContext *src); +#ifndef _WIN32 +#define USE_RENAME_REPLACE 1 +#else +#define USE_RENAME_REPLACE 0 +#endif + #endif /* AVFORMAT_INTERNAL_H */ |