| Index: media/mojo/services/mojo_demuxer_stream_adapter.h
|
| diff --git a/media/mojo/services/mojo_demuxer_stream_adapter.h b/media/mojo/services/mojo_demuxer_stream_adapter.h
|
| index 1e792dae44cc6dafd92876ad585c9de6b6d67fe8..89ecfb521e39cbeb27cb4692bccf64f12232a28a 100644
|
| --- a/media/mojo/services/mojo_demuxer_stream_adapter.h
|
| +++ b/media/mojo/services/mojo_demuxer_stream_adapter.h
|
| @@ -32,18 +32,18 @@ class MojoDemuxerStreamAdapter : public media::DemuxerStream,
|
| virtual ~MojoDemuxerStreamAdapter();
|
|
|
| // media::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;
|
| + 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;
|
|
|
| // mojo::DemuxerStreamClient implementation.
|
| - virtual void OnStreamReady(mojo::ScopedDataPipeConsumerHandle pipe) OVERRIDE;
|
| + virtual void OnStreamReady(mojo::ScopedDataPipeConsumerHandle pipe) override;
|
| virtual void OnAudioDecoderConfigChanged(
|
| - mojo::AudioDecoderConfigPtr config) OVERRIDE;
|
| + mojo::AudioDecoderConfigPtr config) override;
|
|
|
| private:
|
| // The callback from |demuxer_stream_| that a read operation has completed.
|
|
|