diff options
| author | wez <wez@chromium.org> | 2015-07-14 09:24:53 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-14 16:25:25 +0000 |
| commit | 9ad574b22a9c8e914a70b580ef22d195c6c775fb (patch) | |
| tree | 8af540e3fcee66c4e5ebb2615a5451fd87fcae1d /remoting/codec/video_decoder_vpx.cc | |
| parent | 09903b31ee8a9bf3dfbac6ceb21452c969025071 (diff) | |
| download | chromium_src-9ad574b22a9c8e914a70b580ef22d195c6c775fb.zip chromium_src-9ad574b22a9c8e914a70b580ef22d195c6c775fb.tar.gz chromium_src-9ad574b22a9c8e914a70b580ef22d195c6c775fb.tar.bz2 | |
Clean up some NULL->nullptr in remoting/codec/.
Review URL: https://codereview.chromium.org/1240563002
Cr-Commit-Position: refs/heads/master@{#338701}
Diffstat (limited to 'remoting/codec/video_decoder_vpx.cc')
| -rw-r--r-- | remoting/codec/video_decoder_vpx.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/remoting/codec/video_decoder_vpx.cc b/remoting/codec/video_decoder_vpx.cc index e16be14..7a8020f 100644 --- a/remoting/codec/video_decoder_vpx.cc +++ b/remoting/codec/video_decoder_vpx.cc @@ -98,7 +98,7 @@ bool VideoDecoderVpx::DecodePacket(const VideoPacket& packet) { // Do the actual decoding. vpx_codec_err_t ret = vpx_codec_decode( codec_.get(), reinterpret_cast<const uint8*>(packet.data().data()), - packet.data().size(), NULL, 0); + packet.data().size(), nullptr, 0); if (ret != VPX_CODEC_OK) { const char* error = vpx_codec_error(codec_.get()); const char* error_detail = vpx_codec_error_detail(codec_.get()); @@ -108,7 +108,7 @@ bool VideoDecoderVpx::DecodePacket(const VideoPacket& packet) { } // Gets the decoded data. - vpx_codec_iter_t iter = NULL; + vpx_codec_iter_t iter = nullptr; vpx_image_t* image = vpx_codec_get_frame(codec_.get(), &iter); if (!image) { LOG(ERROR) << "No video frame decoded"; @@ -329,7 +329,7 @@ const webrtc::DesktopRegion* VideoDecoderVpx::GetImageShape() { VideoDecoderVpx::VideoDecoderVpx(ScopedVpxCodec codec) : codec_(codec.Pass()), - last_image_(NULL) { + last_image_(nullptr) { DCHECK(codec_); } |