summaryrefslogtreecommitdiffstats
path: root/remoting/codec/video_decoder_vpx.cc
diff options
context:
space:
mode:
Diffstat (limited to 'remoting/codec/video_decoder_vpx.cc')
-rw-r--r--remoting/codec/video_decoder_vpx.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/codec/video_decoder_vpx.cc b/remoting/codec/video_decoder_vpx.cc
index 0be9201..bae8c23 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()));