Merge commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Sep 2013 00:15:36 +0000 (02:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 30 Sep 2013 00:15:36 +0000 (02:15 +0200)
* commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3':
  Add support for multichannel ATRAC3+ streams.

Conflicts:
libavformat/oma.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/oma.c
libavformat/oma.h
libavformat/omadec.c

Simple merge
Simple merge
Simple merge