media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h - Issue 623263003: replace OVERRIDE and FINAL with override and final in media/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h ('k') | media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h

diff --git a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h

index 446fb283fb4f4f267610ff31eda5ffe966abb9f1..00e11fddf47cf2f187f0e8f934bcea8117b819c0 100644

--- a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h

+++ b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h

@@ -23,14 +23,14 @@ class FFmpegCdmVideoDecoder : public CdmVideoDecoder {

virtual ~FFmpegCdmVideoDecoder();

// CdmVideoDecoder implementation.

- virtual bool Initialize(const cdm::VideoDecoderConfig& config) OVERRIDE;

- virtual void Deinitialize() OVERRIDE;

- virtual void Reset() OVERRIDE;

+ virtual bool Initialize(const cdm::VideoDecoderConfig& config) override;

+ virtual void Deinitialize() override;

+ virtual void Reset() override;

virtual cdm::Status DecodeFrame(const uint8_t* compressed_frame,

int32_t compressed_frame_size,

int64_t timestamp,

- cdm::VideoFrame* decoded_frame) OVERRIDE;

- virtual bool is_initialized() const OVERRIDE { return is_initialized_; }

+ cdm::VideoFrame* decoded_frame) override;

+ virtual bool is_initialized() const override { return is_initialized_; }

// Returns true when |format| and |data_size| specify a supported video

// output configuration.