Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Sep 2013 08:20:11 +0000 (10:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Sep 2013 08:20:11 +0000 (10:20 +0200)
* qatar/master:
  movenc: Simplify setting the fragmentation flag

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/movenc.c

@@@ -3812,16 -3287,9 +3811,15 @@@ static int mov_write_header(AVFormatCon
                              FF_MOV_FLAG_FRAG_CUSTOM)) &&
              !mov->max_fragment_duration && !mov->max_fragment_size)
              mov->max_fragment_duration = 5000000;
-         mov->flags |= FF_MOV_FLAG_EMPTY_MOOV | FF_MOV_FLAG_SEPARATE_MOOF |
-                       FF_MOV_FLAG_FRAGMENT;
+         mov->flags |= FF_MOV_FLAG_EMPTY_MOOV | FF_MOV_FLAG_SEPARATE_MOOF;
      }
  
 +    if (mov->reserved_moov_size){
 +        mov->reserved_moov_pos= avio_tell(pb);
 +        if (mov->reserved_moov_size > 0)
 +            avio_skip(pb, mov->reserved_moov_size);
 +    }
 +
      if (!(mov->flags & FF_MOV_FLAG_FRAGMENT)) {
          if (mov->flags & FF_MOV_FLAG_FASTSTART)
              mov->reserved_moov_pos = avio_tell(pb);