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

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

index 0ff5269bb5c2c82b16f318ff459ce628dfcf9694..56f31e59ddd20a9aab1956e3af03e396753a4ef1 100644

--- a/webrtc/video/video_receive_stream.h

+++ b/webrtc/video/video_receive_stream.h

@@ -22,9 +22,9 @@

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

#include "webrtc/video/encoded_frame_callback_adapter.h"

#include "webrtc/video/receive_statistics_proxy.h"

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

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

#include "webrtc/video_encoder.h"

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

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

#include "webrtc/video_receive_stream.h"

namespace webrtc {

« no previous file with comments | « webrtc/video/video_capture_input.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »