Merge commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3'

* commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3':
  Add support for multichannel ATRAC3+ streams.

Conflicts:
	libavformat/oma.c

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

diff --cc libavformat/oma.c
Simple merge

diff --cc libavformat/oma.h
Simple merge

diff --cc libavformat/omadec.c
Simple merge