From 1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 18 Feb 2014 16:11:59 +0200 Subject: [PATCH] movenc: Add a fallback fragmentation method for plain mp4 as well MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously the default fragmentation method was only enabled if writing an ISM file. Signed-off-by: Martin Storsjö --- libavformat/movenc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 43a164730c..762cfef3f2 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3315,15 +3315,13 @@ static int mov_write_header(AVFormatContext *s) enable_tracks(s); - if (mov->mode == MODE_ISM) { + 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->flags & FF_MOV_FLAG_FRAGMENT)) { + } else { if (mov->flags & FF_MOV_FLAG_FASTSTART) mov->reserved_moov_pos = avio_tell(pb); mov_write_mdat_tag(pb, mov);