diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 01:19:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 01:29:36 +0200 |
| commit | 8eb2c411c1e56be522cce65b8acf92dd8b9fbfdd (patch) | |
| tree | 1733466c92a06c2997cce97e527ad229ac588990 | |
| parent | ce838ad950fcf8b2a8823d7606a05077ebe91f9f (diff) | |
| parent | 677c804aa3a78d61b21e6423165a252846c20f0e (diff) | |
| download | ffmpeg-8eb2c411c1e56be522cce65b8acf92dd8b9fbfdd.tar.gz | |
Merge commit '677c804aa3a78d61b21e6423165a252846c20f0e'
* commit '677c804aa3a78d61b21e6423165a252846c20f0e':
aac: correctly map 7.1ch-wide AAC from FDK AAC encoder
Sample: FDK_7.1ch_wide.aac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/aacdec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index c0a41e0917..94fb5f051b 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -303,6 +303,11 @@ static uint64_t sniff_channel_order(uint8_t (*layout_map)[3], int tags) if (num_back_channels < 0) return 0; + if (num_side_channels == 0 && num_back_channels >= 4) { + num_side_channels = 2; + num_back_channels -= 2; + } + i = 0; if (num_front_channels & 1) { e2c_vec[i] = (struct elem_to_channel) { |