aboutsummaryrefslogtreecommitdiff
path: root/libvpx/test/user_priv_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'libvpx/test/user_priv_test.cc')
-rw-r--r--libvpx/test/user_priv_test.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/libvpx/test/user_priv_test.cc b/libvpx/test/user_priv_test.cc
index 7bea76b0a..20741f826 100644
--- a/libvpx/test/user_priv_test.cc
+++ b/libvpx/test/user_priv_test.cc
@@ -57,18 +57,18 @@ string DecodeFile(const string &filename) {
void *user_priv = reinterpret_cast<void *>(&frame_num);
const vpx_codec_err_t res =
decoder.DecodeFrame(video.cxdata(), video.frame_size(),
- (frame_num == 0) ? NULL : user_priv);
+ (frame_num == 0) ? nullptr : user_priv);
if (res != VPX_CODEC_OK) {
EXPECT_EQ(VPX_CODEC_OK, res) << decoder.DecodeError();
break;
}
libvpx_test::DxDataIterator dec_iter = decoder.GetDxData();
- const vpx_image_t *img = NULL;
+ const vpx_image_t *img = nullptr;
// Get decompressed data.
while ((img = dec_iter.Next())) {
if (frame_num == 0) {
- CheckUserPrivateData(img->user_priv, NULL);
+ CheckUserPrivateData(img->user_priv, nullptr);
} else {
CheckUserPrivateData(img->user_priv, &frame_num);
@@ -78,7 +78,7 @@ string DecodeFile(const string &filename) {
ref.idx = rnd.Rand8() % 3;
decoder.Control(VP9_GET_REFERENCE, &ref);
- CheckUserPrivateData(ref.img.user_priv, NULL);
+ CheckUserPrivateData(ref.img.user_priv, nullptr);
}
md5.Add(img);
}