* commit '8fcd121b823caeadbe7597c9ae9229f6f164f949': doc: Use the succinct syntax for the channelmap example Conflicts: doc/filters.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>