Michael Niedermayer 7a28a9f68e Merge commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3' ...

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

Conflicts:
	libavformat/oma.c

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

2013-09-30 02:15:36 +02:00

1.6 KiB

Raw Blame History

View Raw