| 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 89ecfb521e39cbeb27cb4692bccf64f12232a28a..60b4a387c801d1a38eac1269e31c9553d11a9531 100644
|
| --- a/media/mojo/services/mojo_demuxer_stream_adapter.h
|
| +++ b/media/mojo/services/mojo_demuxer_stream_adapter.h
|
| @@ -29,21 +29,20 @@ class MojoDemuxerStreamAdapter : public media::DemuxerStream,
|
| // NOTE: Illegal to call any methods until |stream_ready_cb| is invoked.
|
| MojoDemuxerStreamAdapter(mojo::DemuxerStreamPtr demuxer_stream,
|
| const base::Closure& stream_ready_cb);
|
| - virtual ~MojoDemuxerStreamAdapter();
|
| + ~MojoDemuxerStreamAdapter() override;
|
|
|
| // 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;
|
| + 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;
|
|
|
| // mojo::DemuxerStreamClient implementation.
|
| - virtual void OnStreamReady(mojo::ScopedDataPipeConsumerHandle pipe) override;
|
| - virtual void OnAudioDecoderConfigChanged(
|
| - mojo::AudioDecoderConfigPtr config) override;
|
| + void OnStreamReady(mojo::ScopedDataPipeConsumerHandle pipe) override;
|
| + void OnAudioDecoderConfigChanged(mojo::AudioDecoderConfigPtr config) override;
|
|
|
| private:
|
| // The callback from |demuxer_stream_| that a read operation has completed.
|
|
|