From 46808fdf04ab113df374157b90b506eb3110daf2 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Sat, 3 Jan 2015 01:44:38 +0200 Subject: movenc: Enable editlists by default if delay_moov is enabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Being able to write editlists properly is one of the main points in the delay_moov flag. Signed-off-by: Martin Storsjö --- libavformat/movenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavformat/movenc.c') diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 75c2d27a78..72da0101f9 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3696,7 +3696,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. -- cgit v1.2.3