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

Unified Diff: remoting/codec/video_decoder_vpx.cc

Issue 609923004: Cleanup usage of scoped_ptr<> in remoting for C++11 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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: remoting/codec/video_decoder_vpx.cc
diff --git a/remoting/codec/video_decoder_vpx.cc b/remoting/codec/video_decoder_vpx.cc
index 0be92018a618fd927b0818c3e1b53fd3c9ab36d5..bae8c2353f56613c73aed94c65fe9444d9b798eb 100644
--- a/remoting/codec/video_decoder_vpx.cc
+++ b/remoting/codec/video_decoder_vpx.cc
@@ -56,7 +56,7 @@ scoped_ptr<VideoDecoderVpx> VideoDecoderVpx::CreateForVP8() {
vpx_codec_dec_init(codec.get(), vpx_codec_vp8_dx(), &config, 0);
if (ret != VPX_CODEC_OK) {
LOG(ERROR) << "Cannot initialize codec.";
- return scoped_ptr<VideoDecoderVpx>();
+ return nullptr;
}
return scoped_ptr<VideoDecoderVpx>(new VideoDecoderVpx(codec.Pass()));
@@ -76,7 +76,7 @@ scoped_ptr<VideoDecoderVpx> VideoDecoderVpx::CreateForVP9() {
vpx_codec_dec_init(codec.get(), vpx_codec_vp9_dx(), &config, 0);
if (ret != VPX_CODEC_OK) {
LOG(ERROR) << "Cannot initialize codec.";
- return scoped_ptr<VideoDecoderVpx>();
+ return nullptr;
}
return scoped_ptr<VideoDecoderVpx>(new VideoDecoderVpx(codec.Pass()));

Powered by Google App Engine
This is Rietveld 408576698