diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-05-06 21:11:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-06 21:11:43 +0000 |
| commit | 8494edb8b060834846b149dfa6db683d57ea248a (patch) | |
| tree | d7a7a6e6074f207dd8e8ee86618dc82dcf90bbe0 /libMpegTPDec/src/tpdec_latm.h | |
| parent | 696a3cf9e8f2cccb9a12d3ab4c0adcbde433f205 (diff) | |
| parent | ad6ba7f548b009da6a5265845804ca37b3955c00 (diff) | |
| download | fdk-aac-8494edb8b060834846b149dfa6db683d57ea248a.tar.gz fdk-aac-8494edb8b060834846b149dfa6db683d57ea248a.tar.bz2 fdk-aac-8494edb8b060834846b149dfa6db683d57ea248a.zip | |
Merge "Avoid integer overflows in CLatmDemux_ReadAuChunkLengthInfo() and FDK_get32() to prevent endless loop." into sc-dev am: f633fc085e am: ad6ba7f548
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/14373121
Change-Id: I5a359e83c96fce7323ff0e108102798b9571f28e
Diffstat (limited to 'libMpegTPDec/src/tpdec_latm.h')
| -rw-r--r-- | libMpegTPDec/src/tpdec_latm.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libMpegTPDec/src/tpdec_latm.h b/libMpegTPDec/src/tpdec_latm.h index 6af553d..8b8c971 100644 --- a/libMpegTPDec/src/tpdec_latm.h +++ b/libMpegTPDec/src/tpdec_latm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2018 Fraunhofer-Gesellschaft zur Förderung der angewandten +© Copyright 1995 - 2021 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -151,8 +151,6 @@ typedef struct { AudioPreRoll */ } CLatmDemux; -int CLatmDemux_ReadAuChunkLengthInfo(HANDLE_FDK_BITSTREAM bs); - TRANSPORTDEC_ERROR CLatmDemux_Read(HANDLE_FDK_BITSTREAM bs, CLatmDemux *pLatmDemux, TRANSPORT_TYPE tt, CSTpCallBacks *pTpDecCallbacks, |