diff options
| author | James Zern <jzern@google.com> | 2018-12-11 18:06:20 -0800 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2018-12-12 14:43:55 -0800 |
| commit | f00890eecdf8365ea125ac16769a83aa6b68792d (patch) | |
| tree | ba4747034f2a5307d1b48c58ce42f7e2df66c3db /third_party/libwebm/common | |
| parent | d84c2ddbb2da7f16307a1fae16134ea47d1e350e (diff) | |
| download | libvpx-f00890eecdf8365ea125ac16769a83aa6b68792d.tar libvpx-f00890eecdf8365ea125ac16769a83aa6b68792d.tar.gz libvpx-f00890eecdf8365ea125ac16769a83aa6b68792d.tar.bz2 libvpx-f00890eecdf8365ea125ac16769a83aa6b68792d.zip | |
update libwebm to libwebm-1.0.0.27-352-g6ab9fcf
https://chromium.googlesource.com/webm/libwebm/+log/af81f26..6ab9fcf
Change-Id: I9d56e1fbaba9b96404b4fbabefddc1a85b79c25d
Diffstat (limited to 'third_party/libwebm/common')
| -rw-r--r-- | third_party/libwebm/common/file_util.cc | 2 | ||||
| -rw-r--r-- | third_party/libwebm/common/webmids.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/third_party/libwebm/common/file_util.cc b/third_party/libwebm/common/file_util.cc index 618ffc087..e6109d5a0 100644 --- a/third_party/libwebm/common/file_util.cc +++ b/third_party/libwebm/common/file_util.cc @@ -46,7 +46,7 @@ std::string GetTempFileName() { errno_t err = tmpnam_s(tmp_file_name); #else char* fname_pointer = tmpnam(tmp_file_name); - errno_t err = (fname_pointer == &tmp_file_name[0]) ? 0 : -1; + int err = (fname_pointer == &tmp_file_name[0]) ? 0 : -1; #endif if (err == 0) { return std::string(tmp_file_name); diff --git a/third_party/libwebm/common/webmids.h b/third_party/libwebm/common/webmids.h index 89d722a71..fc0c20814 100644 --- a/third_party/libwebm/common/webmids.h +++ b/third_party/libwebm/common/webmids.h @@ -93,6 +93,7 @@ enum MkvId { kMkvDisplayHeight = 0x54BA, kMkvDisplayUnit = 0x54B2, kMkvAspectRatioType = 0x54B3, + kMkvColourSpace = 0x2EB524, kMkvFrameRate = 0x2383E3, // end video // colour |