aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2020-11-17 12:54:43 +0200
committerMartin Storsjo <martin@martin.st>2020-11-17 12:58:30 +0200
commit2b3e9ddc814b6cff20e296212f8ffbbb277f1df8 (patch)
tree30b06ecb80aee190319eb6144a8b16d1a5ae58c7
parentd9a9f3b79301fea59ce3c3ee1bc36f43f47224f2 (diff)
downloadfdk-aac-2b3e9ddc814b6cff20e296212f8ffbbb277f1df8.tar.gz
fdk-aac-2b3e9ddc814b6cff20e296212f8ffbbb277f1df8.tar.bz2
fdk-aac-2b3e9ddc814b6cff20e296212f8ffbbb277f1df8.zip
Revert "Don't use an enum for a value read directly from the bitstream"
This reverts commit 28fcbe9faed794a9d74aef529beb83386da1f4aa. This local fix doesn't seem to be needed any more after the latest upstream update.
-rw-r--r--libDRCdec/src/drcDec_reader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libDRCdec/src/drcDec_reader.cpp b/libDRCdec/src/drcDec_reader.cpp
index ca35345..367a352 100644
--- a/libDRCdec/src/drcDec_reader.cpp
+++ b/libDRCdec/src/drcDec_reader.cpp
@@ -914,7 +914,7 @@ static void _skipEqCoefficients(HANDLE_FDK_BITSTREAM hBs) {
firFilterOrder;
int uniqueEqSubbandGainsCount, eqSubbandGainRepresentation,
eqSubbandGainCount;
- int eqSubbandGainFormat;
+ EQ_SUBBAND_GAIN_FORMAT eqSubbandGainFormat;
eqDelayMaxPresent = FDKreadBits(hBs, 1);
if (eqDelayMaxPresent) {
@@ -955,7 +955,7 @@ static void _skipEqCoefficients(HANDLE_FDK_BITSTREAM hBs) {
uniqueEqSubbandGainsCount = FDKreadBits(hBs, 6);
if (uniqueEqSubbandGainsCount > 0) {
eqSubbandGainRepresentation = FDKreadBits(hBs, 1);
- eqSubbandGainFormat = FDKreadBits(hBs, 4);
+ eqSubbandGainFormat = (EQ_SUBBAND_GAIN_FORMAT)FDKreadBits(hBs, 4);
switch (eqSubbandGainFormat) {
case GF_QMF32:
eqSubbandGainCount = 32;