aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2020-11-17 12:54:26 +0200
committerMartin Storsjo <martin@martin.st>2020-11-17 12:58:00 +0200
commitd9a9f3b79301fea59ce3c3ee1bc36f43f47224f2 (patch)
tree7800e228d8d1a51b69ebfa1bcac81588c5e0f6c7
parent60a11ea3efcf939f2432e739817b610e671e202f (diff)
downloadfdk-aac-d9a9f3b79301fea59ce3c3ee1bc36f43f47224f2.tar.gz
fdk-aac-d9a9f3b79301fea59ce3c3ee1bc36f43f47224f2.tar.bz2
fdk-aac-d9a9f3b79301fea59ce3c3ee1bc36f43f47224f2.zip
Revert "Don't use an enum for a value read directly from the bitstream"
This reverts commit e7d8591ff208803eee35dc289e89a0d69b707585. This local fix doesn't seem to be needed any more after the latest upstream update.
-rw-r--r--libMpegTPDec/src/tpdec_asc.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libMpegTPDec/src/tpdec_asc.cpp b/libMpegTPDec/src/tpdec_asc.cpp
index 156f325..82f840e 100644
--- a/libMpegTPDec/src/tpdec_asc.cpp
+++ b/libMpegTPDec/src/tpdec_asc.cpp
@@ -1631,14 +1631,14 @@ static TRANSPORTDEC_ERROR configExtension(CSUsacConfig *usc,
TRANSPORTDEC_ERROR ErrorStatus = TRANSPORTDEC_OK;
int numConfigExtensions;
- int usacConfigExtType;
+ CONFIG_EXT_ID usacConfigExtType;
int usacConfigExtLength;
numConfigExtensions = (int)escapedValue(hBs, 2, 4, 8) + 1;
for (int confExtIdx = 0; confExtIdx < numConfigExtensions; confExtIdx++) {
INT nbits;
int loudnessInfoSetConfigExtensionPosition = FDKgetValidBits(hBs);
- usacConfigExtType = escapedValue(hBs, 4, 8, 16);
+ usacConfigExtType = (CONFIG_EXT_ID)escapedValue(hBs, 4, 8, 16);
usacConfigExtLength = (int)escapedValue(hBs, 4, 8, 16);
/* Start bit position of config extension */