diff options
| author | mostynb <mostynb@opera.com> | 2014-10-06 18:04:44 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-07 01:05:52 +0000 |
| commit | 2da2112cb906481f3c280a2b4fac2927619d6df0 (patch) | |
| tree | 2da9215cd888cc4ca935d36376d59bc6f0bdab3d /media/cast/receiver/video_decoder.cc | |
| parent | 886aeccd3824618309ccce5eabb2a70241073bc9 (diff) | |
| download | chromium_src-2da2112cb906481f3c280a2b4fac2927619d6df0.zip chromium_src-2da2112cb906481f3c280a2b4fac2927619d6df0.tar.gz chromium_src-2da2112cb906481f3c280a2b4fac2927619d6df0.tar.bz2 | |
replace OVERRIDE and FINAL with override and final in media/
BUG=417463
Review URL: https://codereview.chromium.org/623263003
Cr-Commit-Position: refs/heads/master@{#298317}
Diffstat (limited to 'media/cast/receiver/video_decoder.cc')
| -rw-r--r-- | media/cast/receiver/video_decoder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/cast/receiver/video_decoder.cc b/media/cast/receiver/video_decoder.cc index 2c7a9fd..1eaa6f3 100644 --- a/media/cast/receiver/video_decoder.cc +++ b/media/cast/receiver/video_decoder.cc @@ -119,7 +119,7 @@ class VideoDecoder::Vp8Impl : public VideoDecoder::ImplBase { CHECK_EQ(VPX_CODEC_OK, vpx_codec_destroy(&context_)); } - virtual scoped_refptr<VideoFrame> Decode(uint8* data, int len) OVERRIDE { + virtual scoped_refptr<VideoFrame> Decode(uint8* data, int len) override { if (len <= 0 || vpx_codec_decode(&context_, data, static_cast<unsigned int>(len), @@ -183,7 +183,7 @@ class VideoDecoder::FakeImpl : public VideoDecoder::ImplBase { private: virtual ~FakeImpl() {} - virtual scoped_refptr<VideoFrame> Decode(uint8* data, int len) OVERRIDE { + virtual scoped_refptr<VideoFrame> Decode(uint8* data, int len) override { // Make sure this is a JSON string. if (!len || data[0] != '{') return NULL; |