webrtc/media/engine/webrtcvideoengine2.h - Issue 2402853002: Revert of Make cricket::VideoFrame inherit webrtc::VideoFrame.

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/media/engine/webrtcvideoengine2.h

Issue 2402853002: Revert of Make cricket::VideoFrame inherit webrtc::VideoFrame. (Closed)

Patch Set: Created 4 years, 2 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/media/engine/webrtcvideoengine2.h

diff --git a/webrtc/media/engine/webrtcvideoengine2.h b/webrtc/media/engine/webrtcvideoengine2.h

index 4c1fd1009901e84fa92f46a36b3007799a22c471..cc4b33e879018b6c7771de309b6e1fa3dfca909e 100644

--- a/webrtc/media/engine/webrtcvideoengine2.h

+++ b/webrtc/media/engine/webrtcvideoengine2.h

@@ -26,11 +26,11 @@

#include "webrtc/media/base/videosourceinterface.h"

#include "webrtc/call.h"

#include "webrtc/media/base/mediaengine.h"

-#include "webrtc/media/base/videoframe.h"

#include "webrtc/media/engine/webrtcvideochannelfactory.h"

#include "webrtc/media/engine/webrtcvideodecoderfactory.h"

#include "webrtc/media/engine/webrtcvideoencoderfactory.h"

#include "webrtc/transport.h"

+#include "webrtc/video_frame.h"

#include "webrtc/video_receive_stream.h"

#include "webrtc/video_send_stream.h"