Index: webrtc/modules/utility/source/coder.h |
diff --git a/webrtc/modules/utility/source/coder.h b/webrtc/modules/utility/source/coder.h |
index abfa87efe1813ea91fd81225cf67fe724d6128c4..399edbd7fb8e162315e04aafde9273ae58a1dc5a 100644 |
--- a/webrtc/modules/utility/source/coder.h |
+++ b/webrtc/modules/utility/source/coder.h |
@@ -11,7 +11,8 @@ |
#ifndef WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_ |
#define WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_ |
-#include "webrtc/base/scoped_ptr.h" |
+#include <memory> |
+ |
#include "webrtc/common_types.h" |
#include "webrtc/modules/audio_coding/include/audio_coding_module.h" |
#include "webrtc/typedefs.h" |
@@ -46,7 +47,7 @@ protected: |
const RTPFragmentationHeader* fragmentation) override; |
private: |
- rtc::scoped_ptr<AudioCodingModule> _acm; |
+ std::unique_ptr<AudioCodingModule> _acm; |
tommi
2016/03/17 12:58:36
fix indent? (seems like it was off before too and
kwiberg-webrtc
2016/03/17 13:06:21
This file is a horrible mix of old and new code fo
|
CodecInst _receiveCodec; |