aboutsummaryrefslogtreecommitdiffstats
path: root/fdk-aac/libPCMutils/src/pcmdmx_lib.cpp
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2020-09-16 10:15:54 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2020-09-16 10:15:54 +0200
commitac10ac25317d2027e21b1390054e47201e7aec98 (patch)
tree4b1114b5806709d99634c1b1571e3fe1ed0a7417 /fdk-aac/libPCMutils/src/pcmdmx_lib.cpp
parentc9b14925962bf6ca3978dc07bf8db32ada7003c5 (diff)
downloadODR-AudioEnc-ac10ac25317d2027e21b1390054e47201e7aec98.tar.gz
ODR-AudioEnc-ac10ac25317d2027e21b1390054e47201e7aec98.tar.bz2
ODR-AudioEnc-ac10ac25317d2027e21b1390054e47201e7aec98.zip
Update fdk-aac
This corresponds to 9718203 in https://github.com/Opendigitalradio/fdk-aac
Diffstat (limited to 'fdk-aac/libPCMutils/src/pcmdmx_lib.cpp')
-rw-r--r--fdk-aac/libPCMutils/src/pcmdmx_lib.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/fdk-aac/libPCMutils/src/pcmdmx_lib.cpp b/fdk-aac/libPCMutils/src/pcmdmx_lib.cpp
index 2070dbc..e3c3fa9 100644
--- a/fdk-aac/libPCMutils/src/pcmdmx_lib.cpp
+++ b/fdk-aac/libPCMutils/src/pcmdmx_lib.cpp
@@ -583,6 +583,9 @@ static PCMDMX_ERROR getChannelMode(
(channelType[ch] & 0x0F) - 1,
0); /* Assign all undefined channels (ACT_NONE) to front channels. */
+ if (channelIndices[ch] >= numCh[channelType[ch] >> 4][chGrp])
+ return PCMDMX_INVALID_CH_CONFIG;
+
spkrPos[ch] = getSpeakerPos(channelType[ch], channelIndices[ch],
numCh[channelType[ch] >> 4][chGrp]);