avformat/movenc: Fix skip_trailer when global_sidx is enabled

6 years ago · 3d0894990d
parent 326cec3771
commit 3d0894990d
1 changed files with 2 additions and 3 deletions
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@ -6745,9 +6745,8 @@ static int mov_write_trailer(AVFormatContext *s)
            avio_seek(pb, mov->reserved_header_pos, SEEK_SET);
            mov_write_sidx_tags(pb, mov, -1, 0);
            avio_seek(pb, end, SEEK_SET);
-            avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_TRAILER);
-            mov_write_mfra_tag(pb, mov);
-        } else if (!(mov->flags & FF_MOV_FLAG_SKIP_TRAILER)) {
+        }
+        if (!(mov->flags & FF_MOV_FLAG_SKIP_TRAILER)) {
            avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_TRAILER);
            mov_write_mfra_tag(pb, mov);
        }