RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-30 11:24:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '22f4d9c303ede1a240538fd105c97047db40dc86'

Browse Source 
* commit '22f4d9c303ede1a240538fd105c97047db40dc86':
  img2enc: Make sure the images are atomically written

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-10-27 12:50:56 +01:00
commit 7daac50067
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/img2enc.c
View File

@ -38,6 +38,7 @@ typedef struct VideoMuxData {
int is_pipe; int is_pipe;
int split_planes; /**< use independent file for each Y, U, V plane */ int split_planes; /**< use independent file for each Y, U, V plane */
char path[1024]; char path[1024];
char tmp[1024];
int update; int update;
int use_strftime; int use_strftime;
const char *muxer; const char *muxer;
@ -50,6 +51,7 @@ static int write_header(AVFormatContext *s)
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(st->codec->pix_fmt); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(st->codec->pix_fmt);
av_strlcpy(img->path, s->filename, sizeof(img->path)); av_strlcpy(img->path, s->filename, sizeof(img->path));
snprintf(img->tmp, sizeof(img->tmp), "%s.tmp", s->filename);
/* find format */ /* find format */
if (s->oformat->flags & AVFMT_NOFILE) if (s->oformat->flags & AVFMT_NOFILE)
@ -100,9 +102,9 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (avio_open2(&pb[i], filename, AVIO_FLAG_WRITE, if (avio_open2(&pb[i], img->tmp, AVIO_FLAG_WRITE,
&s->interrupt_callback, NULL) < 0) { &s->interrupt_callback, NULL) < 0) {
av_log(s, AV_LOG_ERROR, "Could not open file : %s\n", filename); av_log(s, AV_LOG_ERROR, "Could not open file : %s\n", img->tmp);
return AVERROR(EIO); return AVERROR(EIO);
} }
@ -167,6 +169,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
avio_flush(pb[0]); avio_flush(pb[0]);
if (!img->is_pipe) { if (!img->is_pipe) {
avio_closep(&pb[0]); avio_closep(&pb[0]);
ff_rename(img->tmp, filename, s);
} }
img->img_number++; img->img_number++;