Showing with 2 additions and 2 deletions.
  1. +0 −1 libavformat/dashenc.c
  2. +2 −1 libavformat/movenc.c
1 change: 0 additions & 1 deletion libavformat/dashenc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,6 @@ static int dash_write_header(AVFormatContext *s)
os->init_start_pos = 0;

av_dict_set(&opts, "movflags", "frag_custom+dash+delay_moov", 0);
av_dict_set(&opts, "use_editlist", "1", 0);
if ((ret = avformat_write_header(ctx, &opts)) < 0) {
goto fail;
}
Expand Down
3 changes: 2 additions & 1 deletion libavformat/movenc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4651,7 +4651,8 @@ static int mov_write_header(AVFormatContext *s)

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.
Expand Down