From ef629299e9f2b17e2e1e44ea36999d4453365829 Mon Sep 17 00:00:00 2001 From: "niklas.enbom@webrtc.org" Date: Wed, 31 Oct 2012 14:35:11 +0000 Subject: [PATCH] Landing http://review.webrtc.org/914006/ Review URL: https://webrtc-codereview.appspot.com/930007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3030 4adac7df-926f-26a2-2b94-8c16560cd09d --- AUTHORS | 1 + webrtc/video_engine/vie_defines.h | 6 +++--- webrtc/video_engine/vie_remb.h | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/AUTHORS b/AUTHORS index 30d7be820..63073acea 100644 --- a/AUTHORS +++ b/AUTHORS @@ -6,3 +6,4 @@ Mozilla Foundation Ben Strong Petar Jovanovic Martin Storsjo +Jie Mao diff --git a/webrtc/video_engine/vie_defines.h b/webrtc/video_engine/vie_defines.h index 0d7411446..42c91b561 100644 --- a/webrtc/video_engine/vie_defines.h +++ b/webrtc/video_engine/vie_defines.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_DEFINES_H_ -#define WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_DEFINES_H_ +#ifndef WEBRTC_VIDEO_ENGINE_VIE_DEFINES_H_ +#define WEBRTC_VIDEO_ENGINE_VIE_DEFINES_H_ #include "engine_configurations.h" // NOLINT @@ -218,4 +218,4 @@ inline int ChannelId(const int moduleId) { } // namespace webrtc -#endif // WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_DEFINES_H_ +#endif // WEBRTC_VIDEO_ENGINE_VIE_DEFINES_H_ diff --git a/webrtc/video_engine/vie_remb.h b/webrtc/video_engine/vie_remb.h index 43f373e09..215a2756a 100644 --- a/webrtc/video_engine/vie_remb.h +++ b/webrtc/video_engine/vie_remb.h @@ -15,8 +15,8 @@ // for a specified SSRC. -#ifndef WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_REMB_H_ -#define WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_REMB_H_ +#ifndef WEBRTC_VIDEO_ENGINE_VIE_REMB_H_ +#define WEBRTC_VIDEO_ENGINE_VIE_REMB_H_ #include #include @@ -88,4 +88,4 @@ class VieRemb : public RemoteBitrateObserver, public Module { } // namespace webrtc -#endif // WEBRTC_VIDEO_ENGINE_MAIN_SOURCE_VIE_REMB_H_ +#endif // WEBRTC_VIDEO_ENGINE_VIE_REMB_H_