summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
Diffstat (limited to 'media')
-rw-r--r--media/base/stream_parser_buffer.h1
-rw-r--r--media/tools/player_x11/data_source_logger.cc4
-rw-r--r--media/tools/player_x11/data_source_logger.h4
3 files changed, 6 insertions, 3 deletions
diff --git a/media/base/stream_parser_buffer.h b/media/base/stream_parser_buffer.h
index 1122e91..fb36213 100644
--- a/media/base/stream_parser_buffer.h
+++ b/media/base/stream_parser_buffer.h
@@ -22,6 +22,7 @@ class MEDIA_EXPORT StreamParserBuffer : public DataBuffer {
private:
StreamParserBuffer(const uint8* data, int data_size, bool is_keyframe);
+ virtual ~StreamParserBuffer() {}
bool is_keyframe_;
DISALLOW_COPY_AND_ASSIGN(StreamParserBuffer);
diff --git a/media/tools/player_x11/data_source_logger.cc b/media/tools/player_x11/data_source_logger.cc
index 03c0a3d..8a6c29e 100644
--- a/media/tools/player_x11/data_source_logger.cc
+++ b/media/tools/player_x11/data_source_logger.cc
@@ -25,8 +25,6 @@ DataSourceLogger::DataSourceLogger(
streaming_(streaming) {
}
-DataSourceLogger::~DataSourceLogger() {}
-
void DataSourceLogger::set_host(media::DataSourceHost* host) {
VLOG(1) << "set_host(" << host << ")";
data_source_->set_host(host);
@@ -67,3 +65,5 @@ void DataSourceLogger::SetBitrate(int bitrate) {
VLOG(1) << "SetBitrate(" << bitrate << ")";
data_source_->SetBitrate(bitrate);
}
+
+DataSourceLogger::~DataSourceLogger() {}
diff --git a/media/tools/player_x11/data_source_logger.h b/media/tools/player_x11/data_source_logger.h
index 8e08f0f..08e0857b 100644
--- a/media/tools/player_x11/data_source_logger.h
+++ b/media/tools/player_x11/data_source_logger.h
@@ -19,7 +19,6 @@ class DataSourceLogger : public media::DataSource {
// |data_source|.
DataSourceLogger(const scoped_refptr<DataSource>& data_source,
bool force_streaming);
- virtual ~DataSourceLogger();
// media::DataSource implementation.
virtual void set_host(media::DataSourceHost* host) OVERRIDE;
@@ -31,6 +30,9 @@ class DataSourceLogger : public media::DataSource {
virtual bool IsStreaming() OVERRIDE;
virtual void SetBitrate(int bitrate) OVERRIDE;
+ protected:
+ virtual ~DataSourceLogger();
+
private:
scoped_refptr<media::DataSource> data_source_;
bool streaming_;