ffmpeg | branch: master | Martin Storsjö <mar...@martin.st> | Sat Jan 3 01:44:38 2015 +0200| [46808fdf04ab113df374157b90b506eb3110daf2] | committer: Martin Storsjö
movenc: Enable editlists by default if delay_moov is enabled Being able to write editlists properly is one of the main points in the delay_moov flag. Signed-off-by: Martin Storsjö <mar...@martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=46808fdf04ab113df374157b90b506eb3110daf2 --- libavformat/dashenc.c | 1 - libavformat/movenc.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 5e06e35..1432fc3 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -627,7 +627,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; } diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 75c2d27..72da010 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. _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
