Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(192)

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

Issue 1102573006: Update {virtual,override} to follow C++11 style in media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
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 00e11fddf47cf2f187f0e8f934bcea8117b819c0..70bd2bf46c74d7e8a28731f942ac58cfe44391e9 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
@@ -20,17 +20,17 @@ namespace media {
class FFmpegCdmVideoDecoder : public CdmVideoDecoder {
public:
explicit FFmpegCdmVideoDecoder(ClearKeyCdmHost* host);
- virtual ~FFmpegCdmVideoDecoder();
+ ~FFmpegCdmVideoDecoder() override;
// CdmVideoDecoder implementation.
- 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_; }
+ bool Initialize(const cdm::VideoDecoderConfig& config) override;
+ void Deinitialize() override;
+ void Reset() override;
+ cdm::Status DecodeFrame(const uint8_t* compressed_frame,
+ int32_t compressed_frame_size,
+ int64_t timestamp,
+ cdm::VideoFrame* decoded_frame) override;
+ bool is_initialized() const override { return is_initialized_; }
// Returns true when |format| and |data_size| specify a supported video
// output configuration.

Powered by Google App Engine
This is Rietveld 408576698