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>
11 years ago · ef1aae6ea9
parent 53d11f7b2d 1e142d5b48
commit ef1aae6ea9
1 changed files with 1 additions and 1 deletions
--- 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)) &&