webrtc/voice_engine/output_mixer.cc - Issue 2972463002: Revert "Update includes for webrtc/{base => rtc_base} rename (2/3)"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/voice_engine/output_mixer.cc

Issue 2972463002: Revert "Update includes for webrtc/{base => rtc_base} rename (2/3)" (Closed)

Patch Set: Created 3 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: webrtc/voice_engine/output_mixer.cc

diff --git a/webrtc/voice_engine/output_mixer.cc b/webrtc/voice_engine/output_mixer.cc

index c497cc1e165dcd2c029ef6de03189a8ef47f2fc5..170689afa1785d17ae2f5311940e2a45511eb294 100644

--- a/webrtc/voice_engine/output_mixer.cc

+++ b/webrtc/voice_engine/output_mixer.cc

@@ -10,8 +10,8 @@

#include "webrtc/voice_engine/output_mixer.h"

+#include "webrtc/base/format_macros.h"

#include "webrtc/modules/audio_processing/include/audio_processing.h"

-#include "webrtc/rtc_base/format_macros.h"

#include "webrtc/system_wrappers/include/file_wrapper.h"

#include "webrtc/system_wrappers/include/trace.h"

#include "webrtc/voice_engine/statistics.h"

« no previous file with comments | « webrtc/voice_engine/output_mixer.h ('k') | webrtc/voice_engine/shared_data.h » ('j') | no next file with comments »