diff options
| author | Peter Boström <pbos@webrtc.org> | 2015-12-09 12:13:30 +0100 |
|---|---|---|
| committer | Peter Boström <pbos@webrtc.org> | 2015-12-09 11:13:40 +0000 |
| commit | 7623ce4aeb9130c937ba5836490cbb3a35679e79 (patch) | |
| tree | f7d20b01beef47a88bc30fdc58fe9c8bc1e546ce /webrtc/test/rtp_rtcp_observer.h | |
| parent | d3c944755ec546f46d5bdd84bff359fe6c4639e9 (diff) | |
| download | webrtc-7623ce4aeb9130c937ba5836490cbb3a35679e79.tar.gz | |
Reland of Merge webrtc/video_engine/ into webrtc/video/ (patchset #2 id:300001 of https://codereview.webrtc.org/1507903005/ )
Reason for revert:
Bot breakage caused by TickTime::UseFakeClock has been removed.
Original issue's description:
> Revert of Merge webrtc/video_engine/ into webrtc/video/ (patchset #2 id:20001 of https://codereview.webrtc.org/1506773002/ )
>
> Reason for revert:
> Breaks Dr Memory Light https://build.chromium.org/p/client.webrtc/builders/Win%20DrMemory%20Light/builds/4643 and all the Android Tests bots.
>
> Original issue's description:
> > Merge webrtc/video_engine/ into webrtc/video/
> >
> > BUG=webrtc:1695
> > R=mflodman@webrtc.org
> >
> > Committed: https://crrev.com/03ef053202bc5d5ab43460eebf5403232f157646
> > Cr-Commit-Position: refs/heads/master@{#10926}
>
> TBR=mflodman@webrtc.org,pbos@webrtc.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:1695
>
> Committed: https://crrev.com/8237abf563bf4782ee104408b53cc8e55ce44518
> Cr-Commit-Position: refs/heads/master@{#10937}
BUG=webrtc:1695
TBR=mflodman@webrtc.org,kjellander@webrtc.org
NOPRESUBMIT=true
Review URL: https://codereview.webrtc.org/1510183002 .
Cr-Commit-Position: refs/heads/master@{#10948}
Diffstat (limited to 'webrtc/test/rtp_rtcp_observer.h')
| -rw-r--r-- | webrtc/test/rtp_rtcp_observer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webrtc/test/rtp_rtcp_observer.h b/webrtc/test/rtp_rtcp_observer.h index c7e463e164..f8d696c763 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_VIDEO_ENGINE_TEST_COMMON_RTP_RTCP_OBSERVER_H_ -#define WEBRTC_VIDEO_ENGINE_TEST_COMMON_RTP_RTCP_OBSERVER_H_ +#ifndef WEBRTC_TEST_RTP_RTCP_OBSERVER_H_ +#define WEBRTC_TEST_RTP_RTCP_OBSERVER_H_ #include <map> #include <vector> @@ -138,4 +138,4 @@ class PacketTransport : public test::DirectTransport { } // namespace test } // namespace webrtc -#endif // WEBRTC_VIDEO_ENGINE_TEST_COMMON_RTP_RTCP_OBSERVER_H_ +#endif // WEBRTC_TEST_RTP_RTCP_OBSERVER_H_ |