Merge commit '40ed1cbf147d09fc0894bee160f0b6b6d9159fc5'

* commit '40ed1cbf147d09fc0894bee160f0b6b6d9159fc5':
  movenc: Allow writing a DASH sidx atom at the start of files

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/movenc.c
index 15ea4411c3ca546613171394ad0a168c63c28a5d,3ba1cc81aa7e3904cdcb0d67f24f63d74f13e7aa..04e11e248d5cf6ad6a7f35c3cad4500c20ac4605
--- 1/libavformat/movenc.c
--- 2/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@@ -4498,16 -3607,6 +4526,10 @@@ static int mov_write_header(AVFormatCon
          mov->flags |= FF_MOV_FLAG_FRAGMENT | FF_MOV_FLAG_EMPTY_MOOV |
                        FF_MOV_FLAG_DEFAULT_BASE_MOOF;
  
-     /* faststart: moov at the beginning of the file, if supported */
 +    if (mov->flags & FF_MOV_FLAG_FASTSTART) {
-         if (mov->flags & FF_MOV_FLAG_FRAGMENT) {
-             av_log(s, AV_LOG_WARNING, "The faststart flag is incompatible "
-                    "with fragmentation, disabling faststart\n");
-             mov->flags &= ~FF_MOV_FLAG_FASTSTART;
-         } else
-             mov->reserved_moov_size = -1;
++        mov->reserved_moov_size = -1;
 +    }
 +
      if (mov->use_editlist < 0) {
          mov->use_editlist = 1;
          if (mov->flags & FF_MOV_FLAG_FRAGMENT) {

diff --cc libavformat/movenc.h
Simple merge