diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-05 02:45:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-05 02:45:34 +0100 |
| commit | fb22e5ae4585c31fcf4ebe1d255f6eeb24d600e3 (patch) | |
| tree | a61a8141dd29439c576208517bffb878e7713d7f | |
| parent | e7521d9771eac5ba07558b2b2dba1155e57b9670 (diff) | |
| parent | 46808fdf04ab113df374157b90b506eb3110daf2 (diff) | |
| download | ffmpeg-fb22e5ae4585c31fcf4ebe1d255f6eeb24d600e3.tar.gz | |
Merge commit '46808fdf04ab113df374157b90b506eb3110daf2'
* commit '46808fdf04ab113df374157b90b506eb3110daf2':
movenc: Enable editlists by default if delay_moov is enabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/dashenc.c | 1 | ||||
| -rw-r--r-- | libavformat/movenc.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index ecca8879b5..e3e68c432d 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -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; } diff --git a/libavformat/movenc.c b/libavformat/movenc.c index b24ca22254..010c65587f 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -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. |