diff options
| author | Peter Boström <pbos@webrtc.org> | 2015-12-08 09:08:57 +0100 |
|---|---|---|
| committer | Peter Boström <pbos@webrtc.org> | 2015-12-08 08:09:07 +0000 |
| commit | 03ef053202bc5d5ab43460eebf5403232f157646 (patch) | |
| tree | ac188ece5eab58c5b1dc16f4c2bf304b6f793788 /webrtc/test/win | |
| parent | 99ab9447d1b48043adf6bfdf72cf820bbda3ee3f (diff) | |
| download | webrtc-03ef053202bc5d5ab43460eebf5403232f157646.tar.gz | |
Merge webrtc/video_engine/ into webrtc/video/
BUG=webrtc:1695
R=mflodman@webrtc.org
Review URL: https://codereview.webrtc.org/1506773002 .
Cr-Commit-Position: refs/heads/master@{#10926}
Diffstat (limited to 'webrtc/test/win')
| -rw-r--r-- | webrtc/test/win/d3d_renderer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webrtc/test/win/d3d_renderer.h b/webrtc/test/win/d3d_renderer.h index 46ce266460..cf2319edc4 100644 --- a/webrtc/test/win/d3d_renderer.h +++ b/webrtc/test/win/d3d_renderer.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_WIN_D3D_RENDERER_H_ -#define WEBRTC_VIDEO_ENGINE_TEST_COMMON_WIN_D3D_RENDERER_H_ +#ifndef WEBRTC_TEST_WIN_D3D_RENDERER_H_ +#define WEBRTC_TEST_WIN_D3D_RENDERER_H_ #include <Windows.h> #include <d3d9.h> @@ -51,4 +51,4 @@ class D3dRenderer : public VideoRenderer { } // namespace test } // namespace webrtc -#endif // WEBRTC_VIDEO_ENGINE_TEST_COMMON_WIN_D3D_RENDERER_H_ +#endif // WEBRTC_TEST_WIN_D3D_RENDERER_H_ |