Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Sep 2013 11:34:37 +0000 (13:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Sep 2013 11:34:37 +0000 (13:34 +0200)
* qatar/master:
  matroskaenc: Allow chapters to be written in trailer

Conflicts:
libavformat/matroskaenc.c

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

Simple merge
@@@ -107,8 -103,7 +107,9 @@@ typedef struct MatroskaMuxContext 
      int cluster_size_limit;
      int64_t cues_pos;
      int64_t cluster_time_limit;
 +
 +    uint32_t chapter_id_offset;
+     int wrote_chapters;
  } MatroskaMuxContext;