Fix OVERRIDE->override again after reverting video frame cl.
TBR=magjed@webrtc.org
BUG=
Review URL: https://webrtc-codereview.appspot.com/40199004
Cr-Commit-Position: refs/heads/master@{#8600}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8600 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/media/webrtc/webrtcvideoframe.h b/talk/media/webrtc/webrtcvideoframe.h
index 0317f44..3a8981e 100644
--- a/talk/media/webrtc/webrtcvideoframe.h
+++ b/talk/media/webrtc/webrtcvideoframe.h
@@ -181,7 +181,7 @@
size_t pixel_width,
size_t pixel_height,
int64_t elapsed_time,
- int64_t time_stamp) OVERRIDE;
+ int64_t time_stamp) override;
virtual bool Reset(uint32 fourcc,
int w,
int h,
@@ -194,29 +194,29 @@
int64_t elapsed_time,
int64_t time_stamp,
webrtc::VideoRotation rotation,
- bool apply_rotation) OVERRIDE;
- virtual size_t GetWidth() const OVERRIDE;
- virtual size_t GetHeight() const OVERRIDE;
- virtual const uint8* GetYPlane() const OVERRIDE;
- virtual const uint8* GetUPlane() const OVERRIDE;
- virtual const uint8* GetVPlane() const OVERRIDE;
- virtual uint8* GetYPlane() OVERRIDE;
- virtual uint8* GetUPlane() OVERRIDE;
- virtual uint8* GetVPlane() OVERRIDE;
- virtual int32 GetYPitch() const OVERRIDE;
- virtual int32 GetUPitch() const OVERRIDE;
- virtual int32 GetVPitch() const OVERRIDE;
- virtual void* GetNativeHandle() const OVERRIDE;
- virtual size_t GetPixelWidth() const OVERRIDE;
- virtual size_t GetPixelHeight() const OVERRIDE;
- virtual int64_t GetElapsedTime() const OVERRIDE;
- virtual int64_t GetTimeStamp() const OVERRIDE;
- virtual void SetElapsedTime(int64_t elapsed_time) OVERRIDE;
- virtual void SetTimeStamp(int64_t time_stamp) OVERRIDE;
- virtual webrtc::VideoRotation GetVideoRotation() const OVERRIDE;
- virtual VideoFrame* Copy() const OVERRIDE;
- virtual bool MakeExclusive() OVERRIDE;
- virtual size_t CopyToBuffer(uint8* buffer, size_t size) const OVERRIDE;
+ bool apply_rotation) override;
+ virtual size_t GetWidth() const override;
+ virtual size_t GetHeight() const override;
+ virtual const uint8* GetYPlane() const override;
+ virtual const uint8* GetUPlane() const override;
+ virtual const uint8* GetVPlane() const override;
+ virtual uint8* GetYPlane() override;
+ virtual uint8* GetUPlane() override;
+ virtual uint8* GetVPlane() override;
+ virtual int32 GetYPitch() const override;
+ virtual int32 GetUPitch() const override;
+ virtual int32 GetVPitch() const override;
+ virtual void* GetNativeHandle() const override;
+ virtual size_t GetPixelWidth() const override;
+ virtual size_t GetPixelHeight() const override;
+ virtual int64_t GetElapsedTime() const override;
+ virtual int64_t GetTimeStamp() const override;
+ virtual void SetElapsedTime(int64_t elapsed_time) override;
+ virtual void SetTimeStamp(int64_t time_stamp) override;
+ virtual webrtc::VideoRotation GetVideoRotation() const override;
+ virtual VideoFrame* Copy() const override;
+ virtual bool MakeExclusive() override;
+ virtual size_t CopyToBuffer(uint8* buffer, size_t size) const override;
protected:
virtual VideoFrame* CreateEmptyFrame(int w,
@@ -224,7 +224,7 @@
size_t pixel_width,
size_t pixel_height,
int64_t elapsed_time,
- int64_t time_stamp) const OVERRIDE;
+ int64_t time_stamp) const override;
private:
const webrtc::I420VideoFrame* const frame_;
diff --git a/webrtc/common_video/interface/texture_video_frame.h b/webrtc/common_video/interface/texture_video_frame.h
index 225a0ec..7872a78 100644
--- a/webrtc/common_video/interface/texture_video_frame.h
+++ b/webrtc/common_video/interface/texture_video_frame.h
@@ -36,7 +36,7 @@
int height,
int stride_y,
int stride_u,
- int stride_v) OVERRIDE;
+ int stride_v) override;
virtual int CreateFrame(int size_y,
const uint8_t* buffer_y,
int size_u,
@@ -47,7 +47,7 @@
int height,
int stride_y,
int stride_u,
- int stride_v) OVERRIDE;
+ int stride_v) override;
virtual int CreateFrame(int size_y,
const uint8_t* buffer_y,
int size_u,
@@ -59,20 +59,20 @@
int stride_y,
int stride_u,
int stride_v,
- webrtc::VideoRotation rotation) OVERRIDE;
- virtual int CopyFrame(const I420VideoFrame& videoFrame) OVERRIDE;
- virtual I420VideoFrame* CloneFrame() const OVERRIDE;
- virtual void SwapFrame(I420VideoFrame* videoFrame) OVERRIDE;
- virtual uint8_t* buffer(PlaneType type) OVERRIDE;
- virtual const uint8_t* buffer(PlaneType type) const OVERRIDE;
- virtual int allocated_size(PlaneType type) const OVERRIDE;
- virtual int stride(PlaneType type) const OVERRIDE;
- virtual bool IsZeroSize() const OVERRIDE;
- virtual void* native_handle() const OVERRIDE;
+ webrtc::VideoRotation rotation) override;
+ virtual int CopyFrame(const I420VideoFrame& videoFrame) override;
+ virtual I420VideoFrame* CloneFrame() const override;
+ virtual void SwapFrame(I420VideoFrame* videoFrame) override;
+ virtual uint8_t* buffer(PlaneType type) override;
+ virtual const uint8_t* buffer(PlaneType type) const override;
+ virtual int allocated_size(PlaneType type) const override;
+ virtual int stride(PlaneType type) const override;
+ virtual bool IsZeroSize() const override;
+ virtual void* native_handle() const override;
protected:
virtual int CheckDimensions(
- int width, int height, int stride_y, int stride_u, int stride_v) OVERRIDE;
+ int width, int height, int stride_y, int stride_u, int stride_v) override;
private:
// An opaque handle that stores the underlying video frame.
