| Index: content/common/gpu/media/android_video_decode_accelerator.h
|
| diff --git a/content/common/gpu/media/android_video_decode_accelerator.h b/content/common/gpu/media/android_video_decode_accelerator.h
|
| index 0e02ce4c1a8c3cc543af394bfd33ba51ffa8f3d9..2b41925af47abd2cb04b46d97262b6f4b45502cf 100644
|
| --- a/content/common/gpu/media/android_video_decode_accelerator.h
|
| +++ b/content/common/gpu/media/android_video_decode_accelerator.h
|
| @@ -38,15 +38,15 @@ class CONTENT_EXPORT AndroidVideoDecodeAccelerator
|
|
|
| // media::VideoDecodeAccelerator implementation.
|
| virtual bool Initialize(media::VideoCodecProfile profile,
|
| - Client* client) OVERRIDE;
|
| - virtual void Decode(const media::BitstreamBuffer& bitstream_buffer) OVERRIDE;
|
| + Client* client) override;
|
| + virtual void Decode(const media::BitstreamBuffer& bitstream_buffer) override;
|
| virtual void AssignPictureBuffers(
|
| - const std::vector<media::PictureBuffer>& buffers) OVERRIDE;
|
| - virtual void ReusePictureBuffer(int32 picture_buffer_id) OVERRIDE;
|
| - virtual void Flush() OVERRIDE;
|
| - virtual void Reset() OVERRIDE;
|
| - virtual void Destroy() OVERRIDE;
|
| - virtual bool CanDecodeOnIOThread() OVERRIDE;
|
| + const std::vector<media::PictureBuffer>& buffers) override;
|
| + virtual void ReusePictureBuffer(int32 picture_buffer_id) override;
|
| + virtual void Flush() override;
|
| + virtual void Reset() override;
|
| + virtual void Destroy() override;
|
| + virtual bool CanDecodeOnIOThread() override;
|
|
|
| private:
|
| enum State {
|
|
|