Merge commit 'db03cb37fd9650b4a7c752d24a2e84ff27508ee8'

* commit 'db03cb37fd9650b4a7c752d24a2e84ff27508ee8':
  movenc: Allow chapter track in default MODE_MP4

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 53f1b8e..4dae713 100644 (file)
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -3587,7 +3587,7 @@ static int mov_write_header(AVFormatContext *s)
     }
 
     mov->nb_streams = s->nb_streams;
-    if (mov->mode & (MODE_MOV|MODE_IPOD) && s->nb_chapters)
+    if (mov->mode & (MODE_MP4|MODE_MOV|MODE_IPOD) && s->nb_chapters)
         mov->chapter_track = mov->nb_streams++;
 
     if (mov->flags & FF_MOV_FLAG_RTP_HINT) {