* commit '6c786765cd5eb794dedd4a0970dfe689b16dfeeb': movenc: Allow chapters to be written in trailer Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>