summaryrefslogtreecommitdiff
path: root/third_party/libwebm/common/hdr_util.cc
diff options
context:
space:
mode:
authorJohann <johannkoenig@google.com>2018-04-24 15:22:28 -0700
committerJohann Koenig <johannkoenig@google.com>2018-05-14 15:33:14 +0000
commit595edb9669e27927726523c3f463d0eb6ea73f30 (patch)
tree1b81f24654470058d83bdb1aaaa16064dbc358e8 /third_party/libwebm/common/hdr_util.cc
parenta19638ac40e44c36afb71ff541c3840ca4b6d70c (diff)
downloadlibvpx-595edb9669e27927726523c3f463d0eb6ea73f30.tar
libvpx-595edb9669e27927726523c3f463d0eb6ea73f30.tar.gz
libvpx-595edb9669e27927726523c3f463d0eb6ea73f30.tar.bz2
libvpx-595edb9669e27927726523c3f463d0eb6ea73f30.zip
update libwebm
Clears "auto_ptr deprecated" warnings when building with clang v6.0.0 Requires C++11 support. Change-Id: I5ea2744e73deeaa4e7b2599bacf0b6c9cf355a54
Diffstat (limited to 'third_party/libwebm/common/hdr_util.cc')
-rw-r--r--third_party/libwebm/common/hdr_util.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/third_party/libwebm/common/hdr_util.cc b/third_party/libwebm/common/hdr_util.cc
index e1618ce75..916f7170b 100644
--- a/third_party/libwebm/common/hdr_util.cc
+++ b/third_party/libwebm/common/hdr_util.cc
@@ -36,10 +36,10 @@ bool CopyMasteringMetadata(const mkvparser::MasteringMetadata& parser_mm,
if (MasteringMetadataValuePresent(parser_mm.luminance_min))
muxer_mm->set_luminance_min(parser_mm.luminance_min);
- PrimaryChromaticityPtr r_ptr(NULL);
- PrimaryChromaticityPtr g_ptr(NULL);
- PrimaryChromaticityPtr b_ptr(NULL);
- PrimaryChromaticityPtr wp_ptr(NULL);
+ PrimaryChromaticityPtr r_ptr(nullptr);
+ PrimaryChromaticityPtr g_ptr(nullptr);
+ PrimaryChromaticityPtr b_ptr(nullptr);
+ PrimaryChromaticityPtr wp_ptr(nullptr);
if (parser_mm.r) {
if (!CopyPrimaryChromaticity(*parser_mm.r, &r_ptr))