diff options
| author | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-10-22 12:50:00 +0000 |
|---|---|---|
| committer | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-10-22 12:50:00 +0000 |
| commit | 221798a7c4ad83ba7fb8b3ae39b99d44278bbe5a (patch) | |
| tree | c496e823364f8d8bffaa37bdba1b9995614d1e58 /modules/audio_coding/main/acm2/audio_coding_module_impl.cc | |
| parent | b45ab8b2e985f1429e5a2ed27c798f887f0c5fc9 (diff) | |
| download | webrtc-221798a7c4ad83ba7fb8b3ae39b99d44278bbe5a.tar.gz | |
Upgrade scoped_ptr to Chromium's latest version.
Analogous to the recent libjingle change: http://cl/54929753-p10.
This supports scoped_ptr<T[]> and scoped_ptr<C, FreeDeleter> rather
than scoped_array and scoped_ptr_malloc respectively.
- Add Chromium's template-based COMPILE_ASSERT. We didn't have this
previously in order to support the macro in C. Instead, move the
existing macro to compile_assert_c.h.
- Additionally copy the move.h and template_util.h depedencies and add
the WARN_UNUSED_RESULT macro.
- Leave scoped_array and scoped_ptr_malloc for now, but mark as
deprecated.
- Remove scoped_ptr foo(NULL) use. The default constructor handles it.
- Remove the now redundant COMPILE_ASSERT from peerconnection_jni.cc.
- Add a CHECK_ARRAY_SIZE macro to rtp_format_vp8_unittest.cc to remove
some repeated code.
TESTED=trybots
R=pbos@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2449005
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5015 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'modules/audio_coding/main/acm2/audio_coding_module_impl.cc')
| -rw-r--r-- | modules/audio_coding/main/acm2/audio_coding_module_impl.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/modules/audio_coding/main/acm2/audio_coding_module_impl.cc b/modules/audio_coding/main/acm2/audio_coding_module_impl.cc index 911605e8..59d5727a 100644 --- a/modules/audio_coding/main/acm2/audio_coding_module_impl.cc +++ b/modules/audio_coding/main/acm2/audio_coding_module_impl.cc @@ -140,7 +140,6 @@ AudioCodingModuleImpl::AudioCodingModuleImpl(int id) receiver_initialized_(false), callback_crit_sect_(CriticalSectionWrapper::CreateCriticalSection()), secondary_send_codec_inst_(), - secondary_encoder_(NULL), codec_timestamp_(expected_codec_ts_), first_10ms_data_(false) { |