mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 21:19:01 +08:00
82034dbd5f
* [libwebm] upstream changes for Android NDK r15b This applies upstream changes from master to libwebm 1.0.0.27 to support building with Android NDK r15b and later up through Android NDK r23 beta. Commits taken from https://chromium.googlesource.com/webm/libwebm master branch: 0ae757087f5e6eb01dfea16cc09205b2425cfb74 Fix android build failure with NDK r15b. 90967863b2f67962f52595a26abb8e4fa4105d44 mkvparser: fix float conversion warning * [libwebm] update control file * [libwebm] update versions * Update ports/libwebm/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update versions/baseline.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update versions/l-/libwebm.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update versions/baseline.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [libpx] use file INSTALL instead of COPY & RENAME * [libvpx] update versions Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
26 lines
617 B
Diff
26 lines
617 B
Diff
diff --git a/mkvmuxerutil.cpp b/mkvmuxerutil.cpp
|
|
index 27ab15d..8949c85 100644
|
|
--- a/mkvmuxerutil.cpp
|
|
+++ b/mkvmuxerutil.cpp
|
|
@@ -10,6 +10,7 @@
|
|
|
|
#ifdef __ANDROID__
|
|
#include <fcntl.h>
|
|
+#include <unistd.h>
|
|
#endif
|
|
|
|
#include <cassert>
|
|
diff --git a/mkvparser.cpp b/mkvparser.cpp
|
|
index 4f20148..9cc6971 100644
|
|
--- a/mkvparser.cpp
|
|
+++ b/mkvparser.cpp
|
|
@@ -4034,7 +4034,7 @@ long SegmentInfo::Parse() {
|
|
}
|
|
|
|
const double rollover_check = m_duration * m_timecodeScale;
|
|
- if (rollover_check > LLONG_MAX)
|
|
+ if (rollover_check > static_cast<double>(LLONG_MAX))
|
|
return E_FILE_FORMAT_INVALID;
|
|
|
|
if (pos != stop)
|