[FFmpeg-cvslog] hlsenc: write playlist into a temp file and replace the original atomically

Hendrik Leppkes git at videolan.org
Sat Feb 21 01:58:15 CET 2015


ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Feb 20 12:55:14 2015 +0100| [da97e4c64a289ac83c3d53554ff36cdd6586537c] | committer: Michael Niedermayer

hlsenc: write playlist into a temp file and replace the original atomically

Reviewed-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/hlsenc.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 1831c17..0f14e90 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -242,10 +242,12 @@ static int hls_window(AVFormatContext *s, int last)
     int target_duration = 0;
     int ret = 0;
     AVIOContext *out = NULL;
+    char temp_filename[1024];
     int64_t sequence = FFMAX(hls->start_sequence, hls->sequence - hls->nb_entries);
     int version = hls->flags & HLS_SINGLE_FILE ? 4 : 3;
 
-    if ((ret = avio_open2(&out, s->filename, AVIO_FLAG_WRITE,
+    snprintf(temp_filename, sizeof(temp_filename), "%s.tmp", s->filename);
+    if ((ret = avio_open2(&out, temp_filename, AVIO_FLAG_WRITE,
                           &s->interrupt_callback, NULL)) < 0)
         goto fail;
 
@@ -280,6 +282,8 @@ static int hls_window(AVFormatContext *s, int last)
 
 fail:
     avio_closep(&out);
+    if (ret >= 0)
+        ff_rename(temp_filename, s->filename, s);
     return ret;
 }
 



More information about the ffmpeg-cvslog mailing list