webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory_internal.cc - Issue 2964773002: Revert "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/codecs/builtin_audio_encoder_factory_internal.cc

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory_internal.h ('k') | webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory_internal.cc

diff --git a/webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory_internal.cc b/webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory_internal.cc

index 2876440525c42b8576ca4e5c4a642cb261cc133e..3c8c03065a40392d2f3bb610c866fb6d94b1f4bd 100644

--- a/webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory_internal.cc

+++ b/webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory_internal.cc

@@ -13,11 +13,11 @@

#include <memory>

#include <vector>

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

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

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

#include "webrtc/common_types.h"

#include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h"

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

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

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

#ifdef WEBRTC_CODEC_G722

#include "webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h"

#endif