webrtc/call/call.cc - Issue 1507903005: Revert of Merge webrtc/video_engine/ into webrtc/video/

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/call/call.cc

Issue 1507903005: Revert of Merge webrtc/video_engine/ into webrtc/video/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Resolved merge conflict Created 5 years 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

Index: webrtc/call/call.cc

diff --git a/webrtc/call/call.cc b/webrtc/call/call.cc

index 4682e926bd719bc4a01fed9129e90ad1a5114dd7..f6efa6d46a2d331f6b56b6bc2691025cc20e86ec 100644

--- a/webrtc/call/call.cc

+++ b/webrtc/call/call.cc

@@ -39,9 +39,9 @@

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

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

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

-#include "webrtc/video/call_stats.h"

#include "webrtc/video/video_receive_stream.h"

#include "webrtc/video/video_send_stream.h"

+#include "webrtc/video_engine/call_stats.h"

#include "webrtc/voice_engine/include/voe_codec.h"

namespace webrtc {

« no previous file with comments | « webrtc/audio/audio_send_stream_unittest.cc ('k') | webrtc/call/congestion_controller.cc » ('j') | no next file with comments »