summaryrefslogtreecommitdiff
path: root/libavformat/smoothstreamingenc.c
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2014-10-20 00:48:49 +0200
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-10-24 23:42:53 +0100
commit7785ce1c769369abf85b276148548a5510aabb5f (patch)
tree4df0594c42bb4f1524f509b144fd8e857e0c7dbc /libavformat/smoothstreamingenc.c
parent0b66fb4505e0bb43de3797f63f3290f0188d67cc (diff)
lavf: replace rename() with ff_rename()
The new function wraps errno so that its value is correctly reported when other functions overwrite it (eg. in case of logging). CC: libav-stable@libav.org Bug-Id: CID 1135748 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavformat/smoothstreamingenc.c')
-rw-r--r--libavformat/smoothstreamingenc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c
index e3e4abba46..ddd8da7469 100644
--- a/libavformat/smoothstreamingenc.c
+++ b/libavformat/smoothstreamingenc.c
@@ -34,6 +34,7 @@
#include "libavutil/opt.h"
#include "libavutil/avstring.h"
+#include "libavutil/file.h"
#include "libavutil/mathematics.h"
#include "libavutil/intreadwrite.h"
@@ -282,8 +283,7 @@ static int write_manifest(AVFormatContext *s, int final)
avio_printf(out, "</SmoothStreamingMedia>\n");
avio_flush(out);
avio_close(out);
- rename(temp_filename, filename);
- return 0;
+ return ff_rename(temp_filename, filename);
}
static int ism_write_header(AVFormatContext *s)
@@ -540,7 +540,9 @@ static int ism_flush(AVFormatContext *s, int final)
snprintf(header_filename, sizeof(header_filename), "%s/FragmentInfo(%s=%"PRIu64")", os->dirname, os->stream_type_tag, start_ts);
snprintf(target_filename, sizeof(target_filename), "%s/Fragments(%s=%"PRIu64")", os->dirname, os->stream_type_tag, start_ts);
copy_moof(s, filename, header_filename, moof_size);
- rename(filename, target_filename);
+ ret = ff_rename(filename, target_filename);
+ if (ret < 0)
+ break;
add_fragment(os, target_filename, header_filename, start_ts, duration,
os->cur_start_pos, size);
}