| 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()));
|
|
|