aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWeilun Du <wdu@google.com>2023-03-29 12:50:41 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-03-29 12:50:41 +0000
commit6d60e81ee76f90d0f9f57452e924c4af75d9baca (patch)
tree9848448313dce17d1d72218e5909bd41b604374b
parent1809f5f3bdd5dff213d91be8e5dfd20e7e672d33 (diff)
parent88c1f1883275bf372f965c0279c77c185d6d5de6 (diff)
downloadaemu-6d60e81ee76f90d0f9f57452e924c4af75d9baca.tar.gz
Merge "[ASAN] Fix Double Free on Shutdown" am: 88c1f18832
Original change: https://android-review.googlesource.com/c/platform/hardware/google/aemu/+/2511835 Change-Id: I18307b50d8c1163974286c5b48a17c30252e48b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--host-common/include/host-common/H264NaluParser.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/host-common/include/host-common/H264NaluParser.h b/host-common/include/host-common/H264NaluParser.h
index 13c0a81..95d796a 100644
--- a/host-common/include/host-common/H264NaluParser.h
+++ b/host-common/include/host-common/H264NaluParser.h
@@ -88,8 +88,6 @@ enum class H264NaluType : uint8_t {
Undefined = 32, // not in H.264 nalu type; just here to cap the enums so checking is simpler.
};
-static const std::string kNaluTypesStrings[];
-
static bool checkSpsFrame(const uint8_t* frame, size_t szBytes);
static bool checkPpsFrame(const uint8_t* frame, size_t szBytes);
static bool checkIFrame(const uint8_t* frame, size_t szBytes);