avformat/movenc: Fix skip_trailer when global_sidx is enabled

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 26cb2e6ea103daa46ac608b076a6e1c7fe2872d0..7f5dcd703e6064c259eb9080ec26ad2d090bdb94 100644 (file)
--- 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);
         }