aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2020-11-17 12:53:48 +0200
committerMartin Storsjo <martin@martin.st>2020-11-17 12:57:21 +0200
commit60a11ea3efcf939f2432e739817b610e671e202f (patch)
tree04240bfe41d93d37b4dad322d2a7370ab50d30bc
parentea21799a7bbee287ab1963acdef0487291820eb0 (diff)
downloadfdk-aac-60a11ea3efcf939f2432e739817b610e671e202f.tar.gz
fdk-aac-60a11ea3efcf939f2432e739817b610e671e202f.tar.bz2
fdk-aac-60a11ea3efcf939f2432e739817b610e671e202f.zip
Revert "Don't use an enum for a value read directly from the bitstream"
This reverts commit 8439b745f65bce3fd55ffc9f9edcc04f5f447c55. This local fix doesn't seem to be needed any more after the latest upstream update.
-rw-r--r--libMpegTPDec/src/tpdec_asc.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/libMpegTPDec/src/tpdec_asc.cpp b/libMpegTPDec/src/tpdec_asc.cpp
index 56de494..156f325 100644
--- a/libMpegTPDec/src/tpdec_asc.cpp
+++ b/libMpegTPDec/src/tpdec_asc.cpp
@@ -1549,7 +1549,8 @@ static TRANSPORTDEC_ERROR extElementConfig(CSUsacExtElementConfig *extElement,
const AUDIO_OBJECT_TYPE aot) {
TRANSPORTDEC_ERROR ErrorStatus = TRANSPORTDEC_OK;
- int usacExtElementType = escapedValue(hBs, 4, 8, 16);
+ USAC_EXT_ELEMENT_TYPE usacExtElementType =
+ (USAC_EXT_ELEMENT_TYPE)escapedValue(hBs, 4, 8, 16);
/* recurve extension elements which are invalid for USAC */
if (aot == AOT_USAC) {
@@ -1566,7 +1567,7 @@ static TRANSPORTDEC_ERROR extElementConfig(CSUsacExtElementConfig *extElement,
}
}
- extElement->usacExtElementType = (USAC_EXT_ELEMENT_TYPE) usacExtElementType;
+ extElement->usacExtElementType = usacExtElementType;
int usacExtElementConfigLength = escapedValue(hBs, 4, 8, 16);
extElement->usacExtElementConfigLength = (USHORT)usacExtElementConfigLength;
INT bsAnchor;