diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-30 02:15:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-30 02:15:36 +0200 |
| commit | 7a28a9f68e88f066ede77dc13a517c3c545d2a92 (patch) | |
| tree | c004ddb3eeb83a65d050d7bc291903efe498310f /libavformat/oma.h | |
| parent | c7fae9081dfd6196031673d0e90b459351455223 (diff) | |
| parent | 23d0fdcf6f30843fc3f14084d80581f1ca10f1f3 (diff) | |
| download | ffmpeg-7a28a9f68e88f066ede77dc13a517c3c545d2a92.tar.gz | |
Merge commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3'
* commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3':
Add support for multichannel ATRAC3+ streams.
Conflicts:
libavformat/oma.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oma.h')
| -rw-r--r-- | libavformat/oma.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/oma.h b/libavformat/oma.h index c3f998e761..e2a187bacc 100644 --- a/libavformat/oma.h +++ b/libavformat/oma.h @@ -41,4 +41,7 @@ extern const uint16_t ff_oma_srate_tab[8]; extern const AVCodecTag ff_oma_codec_tags[]; +extern const uint64_t ff_oma_chid_to_native_layout[7]; +extern const int ff_oma_chid_to_num_channels[7]; + #endif /* AVFORMAT_OMA_H */ |