| Index: remoting/protocol/video_reader.cc
|
| diff --git a/remoting/protocol/video_reader.cc b/remoting/protocol/video_reader.cc
|
| index db2cc25de91e3cce1e98ed2034a94c53ef140a33..adf7189d97ba428c5e2986afab86a12e66fb3f81 100644
|
| --- a/remoting/protocol/video_reader.cc
|
| +++ b/remoting/protocol/video_reader.cc
|
| @@ -13,19 +13,22 @@ namespace protocol {
|
| VideoReader::~VideoReader() { }
|
|
|
| // static
|
| -VideoReader* VideoReader::Create(const SessionConfig& config) {
|
| +scoped_ptr<VideoReader> VideoReader::Create(const SessionConfig& config) {
|
| const ChannelConfig& video_config = config.video_config();
|
| if (video_config.transport == ChannelConfig::TRANSPORT_STREAM) {
|
| if (video_config.codec == ChannelConfig::CODEC_VP8) {
|
| - return new ProtobufVideoReader(VideoPacketFormat::ENCODING_VP8);
|
| + return scoped_ptr<VideoReader>(
|
| + new ProtobufVideoReader(VideoPacketFormat::ENCODING_VP8));
|
| } else if (video_config.codec == ChannelConfig::CODEC_ZIP) {
|
| - return new ProtobufVideoReader(VideoPacketFormat::ENCODING_ZLIB);
|
| + return scoped_ptr<VideoReader>(
|
| + new ProtobufVideoReader(VideoPacketFormat::ENCODING_ZLIB));
|
| } else if (video_config.codec == ChannelConfig::CODEC_VERBATIM) {
|
| - return new ProtobufVideoReader(VideoPacketFormat::ENCODING_VERBATIM);
|
| + return scoped_ptr<VideoReader>(
|
| + new ProtobufVideoReader(VideoPacketFormat::ENCODING_VERBATIM));
|
| }
|
| }
|
| NOTREACHED();
|
| - return NULL;
|
| + return scoped_ptr<VideoReader>(NULL);
|
| }
|
|
|
| } // namespace protocol
|
|
|