| 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/video_coding/main/source/receiver.h b/webrtc/modules/video_coding/main/source/receiver.h index 0e1f01a..b27e35c 100644 --- a/webrtc/modules/video_coding/main/source/receiver.h +++ b/webrtc/modules/video_coding/main/source/receiver.h
@@ -90,7 +90,7 @@ Clock* const clock_; VCMJitterBuffer jitter_buffer_; VCMTiming* timing_; - scoped_ptr<EventWrapper> render_wait_event_; + rtc::scoped_ptr<EventWrapper> render_wait_event_; VCMReceiverState state_; int max_video_delay_ms_;