Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / media / filters / decrypting_demuxer_stream.h

diff --git a/src/media/filters/decrypting_demuxer_stream.h b/src/media/filters/decrypting_demuxer_stream.h
index b987277..09bf97a 100644 (file)
--- a/src/media/filters/decrypting_demuxer_stream.h
+++ b/src/media/filters/decrypting_demuxer_stream.h
@@ -33,7 +33,7 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {
       const SetDecryptorReadyCB& set_decryptor_ready_cb);
 
   // Cancels all pending operations immediately and fires all pending callbacks.
-  virtual ~DecryptingDemuxerStream();
+  ~DecryptingDemuxerStream() override;
 
   void Initialize(DemuxerStream* stream,
                   const PipelineStatusCB& status_cb);
@@ -45,13 +45,13 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {
   void Reset(const base::Closure& closure);
 
   // DemuxerStream implementation.
-  virtual void Read(const ReadCB& read_cb) OVERRIDE;
-  virtual AudioDecoderConfig audio_decoder_config() OVERRIDE;
-  virtual VideoDecoderConfig video_decoder_config() OVERRIDE;
-  virtual Type type() OVERRIDE;
-  virtual void EnableBitstreamConverter() OVERRIDE;
-  virtual bool SupportsConfigChanges() OVERRIDE;
-  virtual VideoRotation video_rotation() OVERRIDE;
+  void Read(const ReadCB& read_cb) override;
+  AudioDecoderConfig audio_decoder_config() override;
+  VideoDecoderConfig video_decoder_config() override;
+  Type type() override;
+  void EnableBitstreamConverter() override;
+  bool SupportsConfigChanges() override;
+  VideoRotation video_rotation() override;
 
  private:
   // For a detailed state diagram please see this link: http://goo.gl/8jAok