har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/dashenc: use ff_rename instead of avpriv_io_move

Browse Source 
ff_rename always logs the error message.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2020-01-05 16:54:08 +01:00
parent 19b9f8996e
commit b5dba152ef
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/dashenc.c
View File

@ -583,9 +583,7 @@ static void write_hls_media_playlist(OutputStream *os, AVFormatContext *s,
dashenc_io_close(s, &c->m3u8_out, temp_filename_hls); dashenc_io_close(s, &c->m3u8_out, temp_filename_hls);
if (use_rename) if (use_rename)
if (avpriv_io_move(temp_filename_hls, filename_hls) < 0) { ff_rename(temp_filename_hls, filename_hls, os->ctx);
av_log(os->ctx, AV_LOG_WARNING, "renaming file %s to %s failed\n\n", temp_filename_hls, filename_hls);
}
} }
static int flush_init_segment(AVFormatContext *s, OutputStream *os) 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); dashenc_io_close(s, &c->mpd_out, temp_filename);
if (use_rename) { 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; return ret;
} }
@ -1268,7 +1266,7 @@ static int write_manifest(AVFormatContext *s, int final)
} }
dashenc_io_close(s, &c->m3u8_out, temp_filename); dashenc_io_close(s, &c->m3u8_out, temp_filename);
if (use_rename) 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; return ret;
c->master_playlist_created = 1; 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); dashenc_io_close(s, &os->out, os->temp_path);
if (use_rename) { 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) if (ret < 0)
break; break;
} }