Browse Source

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ö <martin@martin.st>
tags/n2.6
Martin Storsjö 11 years ago
parent
commit
46808fdf04
2 changed files with 2 additions and 2 deletions
  1. +0
    -1
      libavformat/dashenc.c
  2. +2
    -1
      libavformat/movenc.c

+ 0
- 1
libavformat/dashenc.c View File

@@ -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;
}


+ 2
- 1
libavformat/movenc.c View File

@@ -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.


Loading…
Cancel
Save