From: Martin Storsjö <martin@martin.st>
Date: Sun, 9 Aug 2015 19:40:39 +0000 (+0300)
Subject: movenc: Place the sidx index after the initial moov/mdat pair
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5f200bbf98efe50f63d0515b115d2ba8dae297bc;p=ffmpeg

movenc: Place the sidx index after the initial moov/mdat pair

For fragmented files with non-empty moov, with a fragment index
(sidx), place the index after the initial moov/mdat pair.

Previously, for this pathological case, the index was written
at the start of the file.

Signed-off-by: Martin Storsjö <martin@martin.st>
---

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index feb6a8480b2..bb2504fa5f1 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -3242,6 +3242,9 @@ static int mov_flush_fragment(AVFormatContext *s)
         avio_write(s->pb, buf, buf_size);
         av_free(buf);
 
+        if (mov->flags & FF_MOV_FLAG_FASTSTART)
+            mov->reserved_header_pos = avio_tell(s->pb);
+
         mov->moov_written = 1;
         mov->mdat_size = 0;
         for (i = 0; i < mov->nb_streams; i++) {