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)
commit2230d85cebee829ad773e6bf0873fca98d7bc410
treeb0ee28074d4f16621b6024631bcffe979a96a4f7
parentb042712a875cbbaece4652aa572501a8cbc20051
parent26b241c0791bfeb9df7b873da4dc74cce0c06be3
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  matroskaenc: Allow chapters to be written in trailer

Conflicts:
libavformat/matroskaenc.c

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