From: Martin Storsjö <martin@martin.st>
Date: Tue, 18 Feb 2014 14:11:59 +0000 (+0200)
Subject: movenc: Add a fallback fragmentation method for plain mp4 as well
X-Git-Tag: android-x86-6.0-r1~10^2~2154
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66;p=android-x86%2Fexternal-ffmpeg.git

movenc: Add a fallback fragmentation method for plain mp4 as well

Previously the default fragmentation method was only enabled
if writing an ISM file.

Signed-off-by: Martin Storsjö <martin@martin.st>
---

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);