Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / modules / audio_coding / main / acm2 / acm_g722.h

diff --git a/src/third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.h b/src/third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.h
index 6cdd79d..dd3b766 100644 (file)
--- a/src/third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.h
+++ b/src/third_party/webrtc/modules/audio_coding/main/acm2/acm_g722.h
@@ -11,8 +11,8 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_G722_H_
 #define WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_G722_H_
 
+#include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h"
-#include "webrtc/system_wrappers/interface/thread_annotations.h"
 
 typedef struct WebRtcG722EncInst G722EncInst;
 typedef struct WebRtcG722DecInst G722DecInst;
@@ -51,8 +51,6 @@ class ACMG722 : public ACMGenericCodec {
 
   int16_t InternalCreateEncoder();
 
-  void InternalDestructEncoderInst(void* ptr_inst);
-
   ACMG722EncStr* ptr_enc_str_;
 
   G722EncInst* encoder_inst_ptr_;