webrtc/modules/audio_coding/neteq/merge.cc - Issue 2969653002: Update includes for webrtc/{base => rtc_base} rename (1/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/modules/audio_coding/neteq/merge.cc

Issue 2969653002: Update includes for webrtc/{base => rtc_base} rename (1/3) (Closed)

Patch Set: Rebased onto 89c4a7e57d524b13fbe0c823a83a4c10c2e63bd0 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/modules/audio_coding/neteq/merge.cc

diff --git a/webrtc/modules/audio_coding/neteq/merge.cc b/webrtc/modules/audio_coding/neteq/merge.cc

index 9efbe4fb9c613ae2c0b92e300a4a1e9012ed4053..df4f792c4aa41250d5b8b3d88bbad5e3d4d195f6 100644

--- a/webrtc/modules/audio_coding/neteq/merge.cc

+++ b/webrtc/modules/audio_coding/neteq/merge.cc

@@ -16,14 +16,14 @@

#include <algorithm> // min, max

#include <memory>

-#include "webrtc/base/safe_conversions.h"

-#include "webrtc/base/safe_minmax.h"

#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"

#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"

#include "webrtc/modules/audio_coding/neteq/cross_correlation.h"

#include "webrtc/modules/audio_coding/neteq/dsp_helper.h"

#include "webrtc/modules/audio_coding/neteq/expand.h"

#include "webrtc/modules/audio_coding/neteq/sync_buffer.h"

+#include "webrtc/rtc_base/safe_conversions.h"

+#include "webrtc/rtc_base/safe_minmax.h"

namespace webrtc {