* qatar/master: matroskaenc: Allow chapters to be written in trailer Conflicts: libavformat/matroskaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>