[FFmpeg-cvslog] lavf/img2enc: add atomic_writing option

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Tue Dec  8 10:44:31 2015 +0100| [b4431c80efe257129878a849ba12c14c3c7f9766] | committer: Clément Bœsch

lavf/img2enc: add atomic_writing option

This behaviour change caused a regression on our side recently, we might
want to disable the option by default.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b4431c80efe257129878a849ba12c14c3c7f9766
---

 libavformat/img2enc.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c
index c2e6e4d..9291802 100644
--- a/libavformat/img2enc.c
+++ b/libavformat/img2enc.c
@@ -73,7 +73,8 @@ static int write_header(AVFormatContext *s)
                              && desc->nb_components >= 3;
     }
 
-    img->use_rename = proto && !strcmp(proto, "file");
+    img->use_rename = img->use_rename < 0 ? proto && !strcmp(proto, "file")
+                                          : img->use_rename;
 
     return 0;
 }
@@ -206,6 +207,7 @@ static const AVOption muxoptions[] = {
     { "update",       "continuously overwrite one file", OFFSET(update),  AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0,       1, ENC },
     { "start_number", "set first number in the sequence", OFFSET(img_number), AV_OPT_TYPE_INT,  { .i64 = 1 }, 0, INT_MAX, ENC },
     { "strftime",     "use strftime for filename", OFFSET(use_strftime),  AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC },
+    { "atomic_writing", "write files atomically (using temporary files and renames)", OFFSET(use_rename), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, ENC },
     { NULL },
 };