* commit '99ccd2ba':
  mlp: store the channel layout for each substream.

Conflicts:
	libavcodec/mlp_parser.c
	libavcodec/mlpdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>