* commit '8fcd121b':
  doc: Use the succinct syntax for the channelmap example

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