diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-27 11:52:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-27 11:52:33 +0100 |
| commit | 4ae1d6021be96dcded093e51d04294075b14e511 (patch) | |
| tree | 44fbc8a90455083052c15e2e19ff5c2f42a3221d /libavformat/internal.h | |
| parent | cc663bd13a97a92a3b3ba838393e77f2e1c490ad (diff) | |
| parent | 675ac56b7ee0f204963fde55295197c5df80aa91 (diff) | |
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>
Diffstat (limited to 'libavformat/internal.h')
| -rw-r--r-- | libavformat/internal.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index b5d4a7c3cb..ce03dac3dd 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -436,10 +436,4 @@ 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 */ |