Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(808)

Unified Diff: content/common/gpu/media/android_video_decode_accelerator.cc

Issue 649533003: C++11 declares a type safe null pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Presubmit errors Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/media/android_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/android_video_decode_accelerator.cc b/content/common/gpu/media/android_video_decode_accelerator.cc
index 0eee64152f51126fa599433e3c83ecc099487693..20b1356b7f5fc4a5d43111f0d74b2e628bd2551b 100644
--- a/content/common/gpu/media/android_video_decode_accelerator.cc
+++ b/content/common/gpu/media/android_video_decode_accelerator.cc
@@ -69,7 +69,7 @@ static inline const base::TimeDelta NoWaitTimeOut() {
AndroidVideoDecodeAccelerator::AndroidVideoDecodeAccelerator(
const base::WeakPtr<gpu::gles2::GLES2Decoder> decoder,
const base::Callback<bool(void)>& make_context_current)
- : client_(NULL),
+ : client_(nullptr),
make_context_current_(make_context_current),
codec_(media::kCodecH264),
state_(NO_ERROR),
@@ -228,7 +228,7 @@ void AndroidVideoDecodeAccelerator::DequeueOutput() {
size_t size = 0;
media::MediaCodecStatus status = media_codec_->DequeueOutputBuffer(
- NoWaitTimeOut(), &buf_index, &offset, &size, &timestamp, &eos, NULL);
+ NoWaitTimeOut(), &buf_index, &offset, &size, &timestamp, &eos, nullptr);
switch (status) {
case media::MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER:
case media::MEDIA_CODEC_ERROR:
@@ -458,7 +458,7 @@ bool AndroidVideoDecodeAccelerator::ConfigureMediaCodec() {
// Pass a dummy 320x240 canvas size and let the codec signal the real size
// when it's known from the bitstream.
media_codec_.reset(media::VideoCodecBridge::CreateDecoder(
- codec_, false, gfx::Size(320, 240), surface.j_surface().obj(), NULL));
+ codec_, false, gfx::Size(320, 240), surface.j_surface().obj(), nullptr));
if (!media_codec_)
return false;

Powered by Google App Engine
This is Rietveld 408576698