Merge commit '573b1de2d7f1db71030f91ecdded7d0bc071f6b6'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Oct 2014 01:15:39 +0000 (02:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Oct 2014 01:17:54 +0000 (02:17 +0100)
* commit '573b1de2d7f1db71030f91ecdded7d0bc071f6b6':
  movenc: Don't use track_id to decide which track is the first in a moof

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

Simple merge
@@@ -171,11 -158,8 +171,12 @@@ typedef struct MOVMuxContext 
      int max_fragment_size;
      int ism_lookahead;
      AVIOContext *mdat_buf;
+     int first_trun;
  
 +    int use_editlist;
 +    int video_track_timescale;
 +
 +    int reserved_moov_size; ///< 0 for disabled, -1 for automatic, size otherwise
      int64_t reserved_moov_pos;
  
      char *major_brand;