| commit | 00b8f6b3643332cce1ee711715f7fbb824d793ca | [log] [tgz] |
|---|---|---|
| author | kwiberg@webrtc.org <kwiberg@webrtc.org> | Thu Feb 26 14:34:55 2015 +0000 |
| committer | kwiberg@webrtc.org <kwiberg@webrtc.org> | Thu Feb 26 14:43:50 2015 +0000 |
| tree | c9b615128a443fe938a38e09023ec700d8adf62b | |
| parent | ac2d27d9ae74eb8d28ec0d5f12f70fa64461ab90 [diff] [blame] |
Use base/scoped_ptr.h; system_wrappers/interface/scoped_ptr.h is going away BUG= R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/36229004 Cr-Commit-Position: refs/heads/master@{#8517} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8517 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/utility/source/file_player_impl.h b/webrtc/modules/utility/source/file_player_impl.h index e1ba420..3093ce2 100644 --- a/webrtc/modules/utility/source/file_player_impl.h +++ b/webrtc/modules/utility/source/file_player_impl.h
@@ -101,7 +101,7 @@ private: int32_t SetUpVideoDecoder(); - scoped_ptr<VideoCoder> video_decoder_; + rtc::scoped_ptr<VideoCoder> video_decoder_; VideoCodec video_codec_info_; int32_t _decodedVideoFrames;