* commit '949c603e':
  af_channelmap: remove now unnecessary goto
  vf_split: fix description

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