summaryrefslogtreecommitdiff
path: root/test/frame_size_tests.cc
diff options
context:
space:
mode:
Diffstat (limited to 'test/frame_size_tests.cc')
-rw-r--r--test/frame_size_tests.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/frame_size_tests.cc b/test/frame_size_tests.cc
index 9397af2b2..d85c193e0 100644
--- a/test/frame_size_tests.cc
+++ b/test/frame_size_tests.cc
@@ -69,7 +69,7 @@ class EncoderWithExpectedError : public ::libvpx_test::Encoder {
#if CONFIG_VP9_ENCODER
return &vpx_codec_vp9_cx_algo;
#else
- return NULL;
+ return nullptr;
#endif
}
};
@@ -130,7 +130,7 @@ class VP9FrameSizeTestsLarge : public ::libvpx_test::EncoderTest,
encoder->InitEncoder(video);
ASSERT_FALSE(::testing::Test::HasFatalFailure());
for (bool again = true; again; video->Next()) {
- again = (video->img() != NULL);
+ again = (video->img() != nullptr);
PreEncodeFrameHook(video, encoder.get());
encoder->EncodeFrame(video, frame_flags_, expected_err);