aboutsummaryrefslogtreecommitdiff
path: root/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc
diff options
context:
space:
mode:
authorkjellander@webrtc.org <kjellander@webrtc.org>2015-11-18 23:07:57 +0100
committerkjellander@webrtc.org <kjellander@webrtc.org>2015-11-18 22:08:46 +0000
commit3c652b67468d182bd36aee4c31557621be50cc92 (patch)
treeae81fa7e63a929c004ec71cfcaca0b7a59b83611 /webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc
parentb7ce96470b99510937e489bcb4dc3165a9ab1b28 (diff)
downloadwebrtc-3c652b67468d182bd36aee4c31557621be50cc92.tar.gz
modules/audio_coding: Remove some codec include dirs
Also clean up some include_dir entries and update the few references to them with absolute include paths instead. Finally fixed a few lint errors and invalid header guards. None of these are used downstream. BUG=webrtc:5095 TESTED=git cl try -c --bot=android_compile_rel --bot=linux_compile_rel --bot=win_compile_rel --bot=mac_compile_rel --bot=ios_rel --bot=linux_gn_rel --bot=win_x64_gn_rel --bot=mac_x64_gn_rel --bot=android_gn_rel -m tryserver.webrtc R=kwiberg@webrtc.org Review URL: https://codereview.webrtc.org/1438663003 . Cr-Commit-Position: refs/heads/master@{#10700}
Diffstat (limited to 'webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc')
-rw-r--r--webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc
index 3fac6583f8..06cc432374 100644
--- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc
+++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc
@@ -16,8 +16,8 @@
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/thread_annotations.h"
#include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
-#include "webrtc/modules/audio_coding/codecs/g711/include/audio_decoder_pcm.h"
-#include "webrtc/modules/audio_coding/codecs/g711/include/audio_encoder_pcm.h"
+#include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h"
+#include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h"
#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h"
#include "webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h"
#include "webrtc/modules/audio_coding/main/acm2/acm_receive_test_oldapi.h"