* commit '839df90c':
  lxf: Support 16-channel files
  lxf: Support version 1 files

Conflicts:
	libavformat/lxfdec.c

See: e701b0cf
See: 1a06d6ddMerged-by: Michael Niedermayer <michaelni@gmx.at>