Merge commit '5f200bbf98efe50f63d0515b115d2ba8dae297bc'

* commit '5f200bbf98efe50f63d0515b115d2ba8dae297bc':
  movenc: Place the sidx index after the initial moov/mdat pair

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 25d4c5fbce345f68c667ab13937c7f849e3b1697..41a47597f4cf9b1b8cd7853d8f4ba576f1733bbf 100644 (file)
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -4181,6 +4181,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++) {