| Index: webrtc/modules/video_coding/video_coding_impl.cc
|
| diff --git a/webrtc/modules/video_coding/video_coding_impl.cc b/webrtc/modules/video_coding/video_coding_impl.cc
|
| index 7f74b4162f26764550f614cc0d1bd249e0b562c8..fc625c1cdddd25437cfb8a184364f829913e1c0f 100644
|
| --- a/webrtc/modules/video_coding/video_coding_impl.cc
|
| +++ b/webrtc/modules/video_coding/video_coding_impl.cc
|
| @@ -65,7 +65,7 @@ class EncodedImageCallbackWrapper : public EncodedImageCallback {
|
| }
|
|
|
| private:
|
| - rtc::scoped_ptr<CriticalSectionWrapper> cs_;
|
| + std::unique_ptr<CriticalSectionWrapper> cs_;
|
| EncodedImageCallback* callback_ GUARDED_BY(cs_);
|
| };
|
|
|
| @@ -286,7 +286,7 @@ class VideoCodingModuleImpl : public VideoCodingModule {
|
| EncodedImageCallbackWrapper post_encode_callback_;
|
| vcm::VideoSender sender_;
|
| vcm::VideoReceiver receiver_;
|
| - rtc::scoped_ptr<EventFactory> own_event_factory_;
|
| + std::unique_ptr<EventFactory> own_event_factory_;
|
| };
|
| } // namespace
|
|
|
|
|