* commit '0897d2fd':
  movenc: Add option to disable nero chapters

Conflicts:
	doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>