summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2014-02-18 16:11:59 +0200
committerMartin Storsjö <martin@martin.st>2014-02-19 09:58:14 +0200
commit1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66 (patch)
treec88a0c02bb9226b08437d99238301b01478dfdd1
parent543156d7518f5e5d731123da066d86278f9fa492 (diff)
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>
-rw-r--r--libavformat/movenc.c6
1 files 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);