diff options
| author | Martin Storsjö <martin@martin.st> | 2014-11-25 10:51:23 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2014-11-27 09:29:47 +0200 |
| commit | 675ac56b7ee0f204963fde55295197c5df80aa91 (patch) | |
| tree | 291037e0f8f56b7a10e0764a2e4207870d1bb71c /libavformat/smoothstreamingenc.c | |
| parent | 79fd186a5035cf16fc0ab288d8f59da8b1ba2c0e (diff) | |
Revert "lavf: Don't try to update files atomically with renames on windows"
This reverts commit b9d08c77a44390b0848c06f20bc0e9e951ba6a3c.
After taking MoveFileEx into use, we can replace files with renames
on windows as well.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/smoothstreamingenc.c')
| -rw-r--r-- | libavformat/smoothstreamingenc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c index c0161b99b8..ddd8da7469 100644 --- a/libavformat/smoothstreamingenc.c +++ b/libavformat/smoothstreamingenc.c @@ -215,16 +215,14 @@ static int write_manifest(AVFormatContext *s, int final) SmoothStreamingContext *c = s->priv_data; AVIOContext *out; char filename[1024], temp_filename[1024]; - const char *write_filename; int ret, i, video_chunks = 0, audio_chunks = 0, video_streams = 0, audio_streams = 0; int64_t duration = 0; snprintf(filename, sizeof(filename), "%s/Manifest", s->filename); snprintf(temp_filename, sizeof(temp_filename), "%s/Manifest.tmp", s->filename); - write_filename = USE_RENAME_REPLACE ? temp_filename : filename; - ret = avio_open2(&out, write_filename, AVIO_FLAG_WRITE, &s->interrupt_callback, NULL); + ret = avio_open2(&out, temp_filename, AVIO_FLAG_WRITE, &s->interrupt_callback, NULL); if (ret < 0) { - av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n", write_filename); + av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n", temp_filename); return ret; } avio_printf(out, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"); @@ -285,7 +283,7 @@ static int write_manifest(AVFormatContext *s, int final) avio_printf(out, "</SmoothStreamingMedia>\n"); avio_flush(out); avio_close(out); - return USE_RENAME_REPLACE ? ff_rename(temp_filename, filename) : 0; + return ff_rename(temp_filename, filename); } static int ism_write_header(AVFormatContext *s) |