| Index: media/filters/dummy_demuxer.h
|
| diff --git a/media/filters/dummy_demuxer.h b/media/filters/dummy_demuxer.h
|
| index e62c11760eb9c7fe39644156da927ce6a9fa3c8d..9cb184b78a51f3f119e9398d52028269e2582953 100644
|
| --- a/media/filters/dummy_demuxer.h
|
| +++ b/media/filters/dummy_demuxer.h
|
| @@ -29,9 +29,10 @@ class DummyDemuxerStream : public DemuxerStream {
|
| virtual const VideoDecoderConfig& video_decoder_config() OVERRIDE;
|
| virtual void EnableBitstreamConverter() OVERRIDE;
|
|
|
| - private:
|
| + protected:
|
| virtual ~DummyDemuxerStream();
|
|
|
| + private:
|
| Type type_;
|
| AudioDecoderConfig audio_config_;
|
| VideoDecoderConfig video_config_;
|
| @@ -42,7 +43,6 @@ class DummyDemuxerStream : public DemuxerStream {
|
| class MEDIA_EXPORT DummyDemuxer : public Demuxer {
|
| public:
|
| DummyDemuxer(bool has_video, bool has_audio);
|
| - virtual ~DummyDemuxer();
|
|
|
| // Demuxer implementation.
|
| virtual void Initialize(DemuxerHost* host,
|
| @@ -52,6 +52,9 @@ class MEDIA_EXPORT DummyDemuxer : public Demuxer {
|
| virtual base::TimeDelta GetStartTime() const OVERRIDE;
|
| virtual int GetBitrate() OVERRIDE;
|
|
|
| + protected:
|
| + virtual ~DummyDemuxer();
|
| +
|
| private:
|
| bool has_video_;
|
| bool has_audio_;
|
|
|