* commit '6c786765':
  movenc: Allow chapters to be written in trailer

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