Index: media/filters/ffmpeg_demuxer.h |
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h |
index 6209a0f9fdf311524f9369a2060cf031a8590ce6..8d4c91594136c7f34b1def22ee1f25e3e8d0e184 100644 |
--- a/media/filters/ffmpeg_demuxer.h |
+++ b/media/filters/ffmpeg_demuxer.h |
@@ -59,7 +59,7 @@ class FFmpegDemuxerStream : public DemuxerStream { |
// Keeps a copy of |demuxer| and initializes itself using information inside |
// |stream|. Both parameters must outlive |this|. |
FFmpegDemuxerStream(FFmpegDemuxer* demuxer, AVStream* stream); |
- virtual ~FFmpegDemuxerStream(); |
+ ~FFmpegDemuxerStream() override; |
// Enqueues the given AVPacket. It is invalid to queue a |packet| after |
// SetEndOfStream() has been called. |
@@ -86,13 +86,13 @@ class FFmpegDemuxerStream : public DemuxerStream { |
} |
// DemuxerStream implementation. |
- virtual Type type() override; |
- virtual void Read(const ReadCB& read_cb) override; |
- virtual void EnableBitstreamConverter() override; |
- virtual bool SupportsConfigChanges() override; |
- virtual AudioDecoderConfig audio_decoder_config() override; |
- virtual VideoDecoderConfig video_decoder_config() override; |
- virtual VideoRotation video_rotation() override; |
+ Type type() override; |
+ void Read(const ReadCB& read_cb) override; |
+ void EnableBitstreamConverter() override; |
+ bool SupportsConfigChanges() override; |
+ AudioDecoderConfig audio_decoder_config() override; |
+ VideoDecoderConfig video_decoder_config() override; |
+ VideoRotation video_rotation() override; |
// Returns the range of buffered data in this stream. |
Ranges<base::TimeDelta> GetBufferedRanges() const; |
@@ -158,18 +158,18 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer { |
DataSource* data_source, |
const NeedKeyCB& need_key_cb, |
const scoped_refptr<MediaLog>& media_log); |
- virtual ~FFmpegDemuxer(); |
+ ~FFmpegDemuxer() override; |
// Demuxer implementation. |
- virtual void Initialize(DemuxerHost* host, |
- const PipelineStatusCB& status_cb, |
- bool enable_text_tracks) override; |
- virtual void Stop() override; |
- virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) override; |
- virtual base::Time GetTimelineOffset() const override; |
- virtual DemuxerStream* GetStream(DemuxerStream::Type type) override; |
- virtual base::TimeDelta GetStartTime() const override; |
- virtual Liveness GetLiveness() const override; |
+ void Initialize(DemuxerHost* host, |
+ const PipelineStatusCB& status_cb, |
+ bool enable_text_tracks) override; |
+ void Stop() override; |
+ void Seek(base::TimeDelta time, const PipelineStatusCB& cb) override; |
+ base::Time GetTimelineOffset() const override; |
+ DemuxerStream* GetStream(DemuxerStream::Type type) override; |
+ base::TimeDelta GetStartTime() const override; |
+ Liveness GetLiveness() const override; |
// Calls |need_key_cb_| with the initialization data encountered in the file. |
void FireNeedKey(const std::string& init_data_type, |