[FFmpeg-cvslog] avformat/movenc: Fix skip_trailer when global_sidx is enabled

[Karthick J]

ffmpeg | branch: master | Karthick J <kjeyapal at akamai.com> | Sun Mar 24 17:48:36 2019 +0530| [3d0894990d174b1328a2c31e40b3efce13efbe53] | committer: Karthick J

avformat/movenc: Fix skip_trailer when global_sidx is enabled

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d0894990d174b1328a2c31e40b3efce13efbe53
---

 libavformat/movenc.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 26cb2e6ea1..7f5dcd703e 100644
--- 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);
         }