webrtc/video/receive_statistics_proxy.h - 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/video/receive_statistics_proxy.h

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/video/receive_statistics_proxy.h

diff --git a/webrtc/video/receive_statistics_proxy.h b/webrtc/video/receive_statistics_proxy.h

index 91f4105e1fb22e0fe93b1c61862ac9a072c12692..613dca9cdc6bd28e390a0b19005986f763705d04 100644

--- a/webrtc/video/receive_statistics_proxy.h

+++ b/webrtc/video/receive_statistics_proxy.h

@@ -20,8 +20,8 @@

#include "webrtc/frame_callback.h"

#include "webrtc/modules/remote_bitrate_estimator/rate_statistics.h"

#include "webrtc/modules/video_coding/include/video_coding_defines.h"

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

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

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

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

#include "webrtc/video_receive_stream.h"

#include "webrtc/video_renderer.h"

« no previous file with comments | « webrtc/video/payload_router_unittest.cc ('k') | webrtc/video/report_block_stats.h » ('j') | no next file with comments »