Merge "Upgrade flac to bfd4f13f3eb1f4d4f9f723e343f63eceedb267ba" am: 3ddf417238 am: 4ed8592b4d
Original change: https://android-review.googlesource.com/c/platform/external/flac/+/1532269
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6a45736234289e33b81cd0d1397a92f993247662
diff --git a/METADATA b/METADATA
index a49ccd2..c92717d 100644
--- a/METADATA
+++ b/METADATA
@@ -5,11 +5,11 @@
type: GIT
value: "https://github.com/xiph/flac.git"
}
- version: "ce6dd6b5732e319ef60716d9cc9af6a836a4011a"
+ version: "bfd4f13f3eb1f4d4f9f723e343f63eceedb267ba"
license_type: RESTRICTED
last_upgrade_date {
year: 2020
- month: 9
- day: 3
+ month: 12
+ day: 17
}
}
diff --git a/oss-fuzz/fuzzing/datasource/datasource.hpp b/oss-fuzz/fuzzing/datasource/datasource.hpp
index e0699d3..09fa8db 100644
--- a/oss-fuzz/fuzzing/datasource/datasource.hpp
+++ b/oss-fuzz/fuzzing/datasource/datasource.hpp
@@ -116,7 +116,7 @@
size_t left;
std::vector<uint8_t> get(const size_t min, const size_t max, const uint64_t id = 0) override;
- // Make copy constructor and assignment opertator private.
+ // Make copy constructor and assignment operator private.
Datasource(const Datasource &) : data(0), size(0), idx(0), left(0) {}
Datasource& operator=(const Datasource &) { return *this; }
public:
