aboutsummaryrefslogtreecommitdiffstats
path: root/libPCMutils
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2020-11-17 12:55:02 +0200
committerMartin Storsjo <martin@martin.st>2020-11-17 12:58:59 +0200
commita0411159e8d9b2357fa9c9cc49638e4f37890e03 (patch)
tree87e8b440347ab23b81e717beb268e5f920ff8904 /libPCMutils
parent2b3e9ddc814b6cff20e296212f8ffbbb277f1df8 (diff)
downloadfdk-aac-a0411159e8d9b2357fa9c9cc49638e4f37890e03.tar.gz
fdk-aac-a0411159e8d9b2357fa9c9cc49638e4f37890e03.tar.bz2
fdk-aac-a0411159e8d9b2357fa9c9cc49638e4f37890e03.zip
Revert "Avoid a failed assert on invalid channel indices"
This reverts commit 9b0f848911068943bbadeb37c0b8857605e74093. This local fix doesn't seem to be needed any more after the latest upstream update.
Diffstat (limited to 'libPCMutils')
-rw-r--r--libPCMutils/src/pcmdmx_lib.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/libPCMutils/src/pcmdmx_lib.cpp b/libPCMutils/src/pcmdmx_lib.cpp
index e3c3fa9..2070dbc 100644
--- a/libPCMutils/src/pcmdmx_lib.cpp
+++ b/libPCMutils/src/pcmdmx_lib.cpp
@@ -583,9 +583,6 @@ 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]);