diff options
author | Karthick J <kjeyapal@akamai.com> | 2019-03-24 17:30:36 +0530 |
---|---|---|
committer | Karthick J <kjeyapal@akamai.com> | 2019-04-02 11:15:57 +0530 |
commit | 3d0894990d174b1328a2c31e40b3efce13efbe53 (patch) | |
tree | 4d0c2bbebbb8464b1f6082e5ca6da05e009f3b2c /libavformat | |
parent | 326cec3771f908c2e9bbf98d945317e6fbdc0053 (diff) | |
download | ffmpeg-streaming-3d0894990d174b1328a2c31e40b3efce13efbe53.zip ffmpeg-streaming-3d0894990d174b1328a2c31e40b3efce13efbe53.tar.gz |
avformat/movenc: Fix skip_trailer when global_sidx is enabled
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/movenc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 26cb2e6..7f5dcd7 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); } |