From df9e4d9fce7c0477299bdafb22aad59715f591e3 Mon Sep 17 00:00:00 2001 From: aleloi Date: Mon, 8 Aug 2016 10:26:09 -0700 Subject: [PATCH] Added new mixer folder to CPPLINT_DIRS. Fixed one small issue. NOTRY=True Review-Url: https://codereview.webrtc.org/2228503003 Cr-Commit-Position: refs/heads/master@{#13677} --- PRESUBMIT.py | 1 + .../modules/audio_mixer/source/new_audio_conference_mixer_impl.h | 1 + 2 files changed, 2 insertions(+) diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 9d813b1881..00bcc3e545 100755 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -20,6 +20,7 @@ CPPLINT_DIRS = [ 'webrtc/call', 'webrtc/common_video', 'webrtc/examples', + 'webrtc/modules/audio_mixer', 'webrtc/modules/bitrate_controller', 'webrtc/modules/congestion_controller', 'webrtc/modules/pacing', diff --git a/webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h b/webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h index a6a3deac14..3d41373b43 100644 --- a/webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h +++ b/webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h @@ -14,6 +14,7 @@ #include #include #include +#include #include "webrtc/base/thread_checker.h" #include "webrtc/engine_configurations.h"