webrtc/test/rtp_rtcp_observer.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/test/rtp_rtcp_observer.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/test/rtp_rtcp_observer.h

diff --git a/webrtc/test/rtp_rtcp_observer.h b/webrtc/test/rtp_rtcp_observer.h

index f8d696c763e1ec5ca3ac93ab8fd0bd9296aada4e..c7e463e1641615957b51323250f3e58c96a838e3 100644

--- a/webrtc/test/rtp_rtcp_observer.h

+++ b/webrtc/test/rtp_rtcp_observer.h

@@ -7,8 +7,8 @@

* in the file PATENTS. All contributing project authors may

* be found in the AUTHORS file in the root of the source tree.

-#ifndef WEBRTC_TEST_RTP_RTCP_OBSERVER_H_

-#define WEBRTC_TEST_RTP_RTCP_OBSERVER_H_

+#ifndef WEBRTC_VIDEO_ENGINE_TEST_COMMON_RTP_RTCP_OBSERVER_H_

+#define WEBRTC_VIDEO_ENGINE_TEST_COMMON_RTP_RTCP_OBSERVER_H_

#include <map>

#include <vector>

@@ -138,4 +138,4 @@ class PacketTransport : public test::DirectTransport {

} // namespace test

} // namespace webrtc

-#endif // WEBRTC_TEST_RTP_RTCP_OBSERVER_H_

+#endif // WEBRTC_VIDEO_ENGINE_TEST_COMMON_RTP_RTCP_OBSERVER_H_

« no previous file with comments | « webrtc/test/null_transport.h ('k') | webrtc/test/run_loop.h » ('j') | no next file with comments »