Skip to content

F
ffmpeg.wasm-core
Commit 3f461566 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

avformat/movenc: simplify code, decrease difference to libav 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent ef1aae6e
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 8 deletions
libavformat/movenc.c
View file @ 3f461566
......@@ -3926,13 +3926,6 @@ static int mov_write_header(AVFormatContext *s)
enable_tracks(s);
if (mov->flags & FF_MOV_FLAG_FRAGMENT) {
/* If no fragmentation options have been set, set a default. */
if (!(mov->flags & (FF_MOV_FLAG_FRAG_KEYFRAME |
FF_MOV_FLAG_FRAG_CUSTOM)) &&
!mov->max_fragment_duration && !mov->max_fragment_size)
mov->flags |= FF_MOV_FLAG_FRAG_KEYFRAME;
}
if (mov->reserved_moov_size){
mov->reserved_moov_pos= avio_tell(pb);
......@@ -3940,7 +3933,13 @@ static int mov_write_header(AVFormatContext *s)
avio_skip(pb, mov->reserved_moov_size);
}
if (!(mov->flags & FF_MOV_FLAG_FRAGMENT)) {
if (mov->flags & FF_MOV_FLAG_FRAGMENT) {
/* If no fragmentation options have been set, set a default. */
if (!(mov->flags & (FF_MOV_FLAG_FRAG_KEYFRAME |
FF_MOV_FLAG_FRAG_CUSTOM)) &&
!mov->max_fragment_duration && !mov->max_fragment_size)
mov->flags |= FF_MOV_FLAG_FRAG_KEYFRAME;
} else {
if (mov->flags & FF_MOV_FLAG_FASTSTART)
mov->reserved_moov_pos = avio_tell(pb);
mov_write_mdat_tag(pb, mov);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment