| Index: content/common/gpu/media/tegra_v4l2_video_device.h
|
| diff --git a/content/common/gpu/media/tegra_v4l2_video_device.h b/content/common/gpu/media/tegra_v4l2_video_device.h
|
| index e588951450a27f1717068a4711f182e08524e8c5..f9e38caa4876889e45f002b866316fdd248068f5 100644
|
| --- a/content/common/gpu/media/tegra_v4l2_video_device.h
|
| +++ b/content/common/gpu/media/tegra_v4l2_video_device.h
|
| @@ -21,28 +21,28 @@ class TegraV4L2Device : public V4L2Device {
|
| explicit TegraV4L2Device(Type type);
|
| virtual ~TegraV4L2Device();
|
|
|
| - virtual int Ioctl(int flags, void* arg) OVERRIDE;
|
| - virtual bool Poll(bool poll_device, bool* event_pending) OVERRIDE;
|
| - virtual bool SetDevicePollInterrupt() OVERRIDE;
|
| - virtual bool ClearDevicePollInterrupt() OVERRIDE;
|
| + virtual int Ioctl(int flags, void* arg) override;
|
| + virtual bool Poll(bool poll_device, bool* event_pending) override;
|
| + virtual bool SetDevicePollInterrupt() override;
|
| + virtual bool ClearDevicePollInterrupt() override;
|
| virtual void* Mmap(void* addr,
|
| unsigned int len,
|
| int prot,
|
| int flags,
|
| - unsigned int offset) OVERRIDE;
|
| - virtual void Munmap(void* addr, unsigned int len) OVERRIDE;
|
| - virtual bool Initialize() OVERRIDE;
|
| + unsigned int offset) override;
|
| + virtual void Munmap(void* addr, unsigned int len) override;
|
| + virtual bool Initialize() override;
|
| virtual EGLImageKHR CreateEGLImage(EGLDisplay egl_display,
|
| EGLContext egl_context,
|
| GLuint texture_id,
|
| gfx::Size frame_buffer_size,
|
| unsigned int buffer_index,
|
| - size_t planes_count) OVERRIDE;
|
| + size_t planes_count) override;
|
| virtual EGLBoolean DestroyEGLImage(EGLDisplay egl_display,
|
| - EGLImageKHR egl_image) OVERRIDE;
|
| - virtual GLenum GetTextureTarget() OVERRIDE;
|
| - virtual uint32 PreferredInputFormat() OVERRIDE;
|
| - virtual uint32 PreferredOutputFormat() OVERRIDE;
|
| + EGLImageKHR egl_image) override;
|
| + virtual GLenum GetTextureTarget() override;
|
| + virtual uint32 PreferredInputFormat() override;
|
| + virtual uint32 PreferredOutputFormat() override;
|
|
|
| private:
|
| const Type type_;
|
|
|