* commit '22ecfcd4':
  af_channelmap: properly set the supported output channel layouts

Conflicts:
	libavfilter/af_channelmap.c

See: 39867f3eMerged-by: Michael Niedermayer <michael@niedermayer.cc>