diff options
author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2020-09-15 16:54:16 +0200 |
---|---|---|
committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2020-09-15 16:54:16 +0200 |
commit | 97182034e8829014bdfc0449c2116d629196f1d4 (patch) | |
tree | 6c3f4e3ef63d33aa16c79e530b46382faf0ab406 /libPCMutils | |
parent | bafe5616b88cc52f9f0ded6403a6b3ec68d8c27c (diff) | |
parent | 3a831a5fbc990c83e9b5b804a082bb158364e793 (diff) | |
download | fdk-aac-97182034e8829014bdfc0449c2116d629196f1d4.tar.gz fdk-aac-97182034e8829014bdfc0449c2116d629196f1d4.tar.bz2 fdk-aac-97182034e8829014bdfc0449c2116d629196f1d4.zip |
Merge remote-tracking branch 'mstorjo/master' into dabplus2
Diffstat (limited to 'libPCMutils')
-rw-r--r-- | libPCMutils/src/pcmdmx_lib.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libPCMutils/src/pcmdmx_lib.cpp b/libPCMutils/src/pcmdmx_lib.cpp index 2070dbc..e3c3fa9 100644 --- a/libPCMutils/src/pcmdmx_lib.cpp +++ b/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]); |