diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-19 14:19:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-19 14:19:45 +0100 |
| commit | ef1aae6ea9aae9a523b6dcd8e670dbca823a88f8 (patch) | |
| tree | d4f14fa9d258a013fb8cc1f5f853e45bda9367bd | |
| parent | 53d11f7b2d380c19ae862331d7283039b49c9f0e (diff) | |
| parent | 1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66 (diff) | |
| download | ffmpeg-ef1aae6ea9aae9a523b6dcd8e670dbca823a88f8.tar.gz | |
Merge commit '1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66'
* commit '1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66':
movenc: Add a fallback fragmentation method for plain mp4 as well
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 a886ab0857..d3829212c2 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3926,7 +3926,7 @@ 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)) && |