summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-04-10 21:15:32 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-04-10 21:15:32 +0000
commitcffd3907702bcb7d271b30a2bf583f9a3fa8cc59 (patch)
tree36ed26c9ff30a555b56f75133acc07e393115f03
parent9e68344159b2b5e3bedb3efd4f22189d6d10df45 (diff)
parent87ad6b892fae5b1119b24d897fd7c987544ddce4 (diff)
downloadaac-android12-mainline-mediaprovider-release.tar.gz
Snap for 8433130 from 87ad6b892fae5b1119b24d897fd7c987544ddce4 to mainline-mediaprovider-releaseandroid-mainline-12.0.0_r121aml_mpr_311911090android12-mainline-mediaprovider-release
Change-Id: I67b6373a26d0dc7e9dd9ecf9a34cfc87f6ded6fb
-rw-r--r--libMpegTPDec/src/tpdec_lib.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/libMpegTPDec/src/tpdec_lib.cpp b/libMpegTPDec/src/tpdec_lib.cpp
index 091d011..8cd9cb0 100644
--- a/libMpegTPDec/src/tpdec_lib.cpp
+++ b/libMpegTPDec/src/tpdec_lib.cpp
@@ -1,7 +1,7 @@
/* -----------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android
-© Copyright 1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten
+© Copyright 1995 - 2022 Fraunhofer-Gesellschaft zur Förderung der angewandten
Forschung e.V. All rights reserved.
1. INTRODUCTION
@@ -351,6 +351,12 @@ TRANSPORTDEC_ERROR transportDec_OutOfBandConfig(HANDLE_TRANSPORTDEC hTp,
}
}
}
+
+ /* if an error is detected terminate config parsing to avoid that an invalid
+ * config is accepted in the second pass */
+ if (err != TRANSPORTDEC_OK) {
+ break;
+ }
}
if (err == TRANSPORTDEC_OK && fConfigFound) {