[FFmpeg-cvslog] avformat/dashenc: use ff_rename instead of avpriv_io_move
Marton Balint
git at videolan.org
Sun Jan 19 23:36:04 EET 2020
ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Sun Jan 5 16:54:08 2020 +0100| [b5dba152ef614c21e0537a7894ef9227b323f21d] | committer: Marton Balint
avformat/dashenc: use ff_rename instead of avpriv_io_move
ff_rename always logs the error message.
Signed-off-by: Marton Balint <cus at passwd.hu>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b5dba152ef614c21e0537a7894ef9227b323f21d
---
libavformat/dashenc.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index 3d8515d9ca..f555f208a7 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -583,9 +583,7 @@ static void write_hls_media_playlist(OutputStream *os, AVFormatContext *s,
dashenc_io_close(s, &c->m3u8_out, temp_filename_hls);
if (use_rename)
- if (avpriv_io_move(temp_filename_hls, filename_hls) < 0) {
- av_log(os->ctx, AV_LOG_WARNING, "renaming file %s to %s failed\n\n", temp_filename_hls, filename_hls);
- }
+ ff_rename(temp_filename_hls, filename_hls, os->ctx);
}
static int flush_init_segment(AVFormatContext *s, OutputStream *os)
@@ -1186,7 +1184,7 @@ static int write_manifest(AVFormatContext *s, int final)
dashenc_io_close(s, &c->mpd_out, temp_filename);
if (use_rename) {
- if ((ret = avpriv_io_move(temp_filename, s->url)) < 0)
+ if ((ret = ff_rename(temp_filename, s->url, s)) < 0)
return ret;
}
@@ -1268,7 +1266,7 @@ static int write_manifest(AVFormatContext *s, int final)
}
dashenc_io_close(s, &c->m3u8_out, temp_filename);
if (use_rename)
- if ((ret = avpriv_io_move(temp_filename, filename_hls)) < 0)
+ if ((ret = ff_rename(temp_filename, filename_hls, s)) < 0)
return ret;
c->master_playlist_created = 1;
}
@@ -1875,7 +1873,7 @@ static int dash_flush(AVFormatContext *s, int final, int stream)
dashenc_io_close(s, &os->out, os->temp_path);
if (use_rename) {
- ret = avpriv_io_move(os->temp_path, os->full_path);
+ ret = ff_rename(os->temp_path, os->full_path, os->ctx);
if (ret < 0)
break;
}
More information about the ffmpeg-cvslog
mailing list