Merge commit '46808fdf04ab113df374157b90b506eb3110daf2'

* commit '46808fdf04ab113df374157b90b506eb3110daf2':
  movenc: Enable editlists by default if delay_moov is enabled

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

diff --cc libavformat/dashenc.c
Simple merge

diff --cc libavformat/movenc.c
index b24ca222543daadd29d80da2245313a320058057,72da0101f9abec2742ef9c5f4312a4ea54e95332..010c65587f7a2e09e988df4b390b885ec4243bb0
--- 1/libavformat/movenc.c
--- 2/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@@ -4645,13 -3694,10 +4645,14 @@@ static int mov_write_header(AVFormatCon
          mov->flags |= FF_MOV_FLAG_FRAGMENT | FF_MOV_FLAG_EMPTY_MOOV |
                        FF_MOV_FLAG_DEFAULT_BASE_MOOF;
  
 +    if (mov->flags & FF_MOV_FLAG_FASTSTART) {
 +        mov->reserved_moov_size = -1;
 +    }
 +
      if (mov->use_editlist < 0) {
          mov->use_editlist = 1;
-         if (mov->flags & FF_MOV_FLAG_FRAGMENT) {
+         if (mov->flags & FF_MOV_FLAG_FRAGMENT &&
+             !(mov->flags & FF_MOV_FLAG_DELAY_MOOV)) {
              // If we can avoid needing an edit list by shifting the
              // tracks, prefer that over (trying to) write edit lists
              // in fragmented output.