* qatar/master:
  mlp_parser: fix request_channel_layout behavior.

Conflicts:
	libavcodec/mlp_parser.c

See: bd35d584Merged-by: Michael Niedermayer <michaelni@gmx.at>