aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2022-01-10 14:00:56 +0200
committerMartin Storsjo <martin@martin.st>2022-01-10 14:11:00 +0200
commitaad97f4ec218d30d3a174c98f6502606b6267d0e (patch)
treee36e95eab491afc891d4c9ad176f106e4f763a45
parent41ae84525e66febd33ea1fa0130a5b46610f4173 (diff)
downloadfdk-aac-aad97f4ec218d30d3a174c98f6502606b6267d0e.tar.gz
fdk-aac-aad97f4ec218d30d3a174c98f6502606b6267d0e.tar.bz2
fdk-aac-aad97f4ec218d30d3a174c98f6502606b6267d0e.zip
Revert "Avoid failing asserts on broken bitstreams"
This reverts commit 6a2eb8b30f4a65d3b9b0422bf14eaf7007149ffd. This issue that this commit fixed seems to have been fixed differently upstream, by 9ed084750d72346b1533119410be9329ae138dcc.
-rw-r--r--libPCMutils/src/pcmdmx_lib.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/libPCMutils/src/pcmdmx_lib.cpp b/libPCMutils/src/pcmdmx_lib.cpp
index 377557a..fca12ce 100644
--- a/libPCMutils/src/pcmdmx_lib.cpp
+++ b/libPCMutils/src/pcmdmx_lib.cpp
@@ -611,8 +611,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]);