diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 10:45:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 10:45:27 +0200 |
| commit | 8d63aaed1efe58d951c312bad01d38277518fa36 (patch) | |
| tree | 5e8dc540cda58fbd8e02840c9e1668cd7f08b514 /libavformat/movenc.c | |
| parent | 9ab8de4b23908de3792540605e2c2e30892cc33d (diff) | |
| parent | db03cb37fd9650b4a7c752d24a2e84ff27508ee8 (diff) | |
Merge commit 'db03cb37fd9650b4a7c752d24a2e84ff27508ee8'
* commit 'db03cb37fd9650b4a7c752d24a2e84ff27508ee8':
movenc: Allow chapter track in default MODE_MP4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 53f1b8ec95..4dae71309c 100644 --- 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) { |