[FFmpeg-cvslog] Merge commit '839df90c718dcab9b9e91ca3c7e73479b3e8103c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 27 12:29:36 2013 +0200| [e82071e7279ab8d8ec138753822222a6cff26f35] | committer: Michael Niedermayer

Merge commit '839df90c718dcab9b9e91ca3c7e73479b3e8103c'

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

Conflicts:
	libavformat/lxfdec.c

See: e701b0cf7553202085840d3bfd1aff432b4de513
See: 1a06d6dd866318b49596c0bf5ed03917f952d3bd
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e82071e7279ab8d8ec138753822222a6cff26f35
---