| Index: webrtc/modules/video_processing/spatial_resampler.h | 
| diff --git a/webrtc/modules/video_processing/main/source/spatial_resampler.h b/webrtc/modules/video_processing/spatial_resampler.h | 
| similarity index 86% | 
| rename from webrtc/modules/video_processing/main/source/spatial_resampler.h | 
| rename to webrtc/modules/video_processing/spatial_resampler.h | 
| index 9a2d8f58c96b084812517c103e2b36af052453f0..064aeb774c47223ed1c714a69ba984a526893ea2 100644 | 
| --- a/webrtc/modules/video_processing/main/source/spatial_resampler.h | 
| +++ b/webrtc/modules/video_processing/spatial_resampler.h | 
| @@ -8,13 +8,13 @@ | 
| *  be found in the AUTHORS file in the root of the source tree. | 
| */ | 
|  | 
| -#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_SPATIAL_RESAMPLER_H | 
| -#define WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_SPATIAL_RESAMPLER_H | 
| +#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_SPATIAL_RESAMPLER_H_ | 
| +#define WEBRTC_MODULES_VIDEO_PROCESSING_SPATIAL_RESAMPLER_H_ | 
|  | 
| #include "webrtc/typedefs.h" | 
|  | 
| #include "webrtc/modules/include/module_common_types.h" | 
| -#include "webrtc/modules/video_processing/main/interface/video_processing_defines.h" | 
| +#include "webrtc/modules/video_processing/include/video_processing_defines.h" | 
|  | 
| #include "webrtc/common_video/libyuv/include/scaler.h" | 
| #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" | 
| @@ -58,4 +58,4 @@ class VPMSimpleSpatialResampler : public VPMSpatialResampler { | 
|  | 
| }  // namespace webrtc | 
|  | 
| -#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_MAIN_SOURCE_SPATIAL_RESAMPLER_H | 
| +#endif  // WEBRTC_MODULES_VIDEO_PROCESSING_SPATIAL_RESAMPLER_H_ | 
|  |