4 files changed, 23 insertions, 11 deletions
diff --git a/media/tools/omx_test/file_reader_util.cc b/media/tools/omx_test/file_reader_util.cc
index 1ba7cea..a599d2f 100644
--- a/media/tools/omx_test/file_reader_util.cc
+++ b/media/tools/omx_test/file_reader_util.cc
@@ -46,6 +46,8 @@ YuvFileReader::YuvFileReader(const FilePath& path,
       output_nv21_(enable_csc) {
 }
 
+YuvFileReader::~YuvFileReader() {}
+
 void YuvFileReader::Read(uint8** output, int* size) {
   if (!file()) {
     *size = 0;
@@ -230,6 +232,8 @@ H264FileReader::H264FileReader(const FilePath& path)
       used_(0) {
 }
 
+H264FileReader::~H264FileReader() {}
+
 void H264FileReader::Read(uint8** output, int *size) {
   // Fill the buffer when it's less than half full.
   int read = 0;
diff --git a/media/tools/omx_test/file_reader_util.h b/media/tools/omx_test/file_reader_util.h
index 4bd028f..01216e8 100644
--- a/media/tools/omx_test/file_reader_util.h
+++ b/media/tools/omx_test/file_reader_util.h
@@ -61,6 +61,8 @@ class YuvFileReader : public BasicFileReader {
                 int height,
                 int loop_count,
                 bool output_nv21);
+  virtual ~YuvFileReader();
+
   virtual void Read(uint8** output, int* size);
 
  private:
@@ -105,6 +107,7 @@ class FFmpegFileReader : public FileReader {
 class H264FileReader : public BasicFileReader {
  public:
   explicit H264FileReader(const FilePath& path);
+  virtual ~H264FileReader();
   virtual void Read(uint8** output, int* size);
 
  private:
diff --git a/media/tools/omx_test/file_sink.cc b/media/tools/omx_test/file_sink.cc
index 98766ab..5e92b02 100644
--- a/media/tools/omx_test/file_sink.cc
+++ b/media/tools/omx_test/file_sink.cc
@@ -10,6 +10,19 @@
 
 namespace media {
 
+FileSink::FileSink(const FilePath& output_path,
+                   bool simulate_copy,
+                   bool enable_csc)
+    : output_path_(output_path),
+      simulate_copy_(simulate_copy),
+      enable_csc_(enable_csc),
+      width_(0),
+      height_(0),
+      copy_buf_size_(0),
+      csc_buf_size_(0) {
+}
+
+FileSink::~FileSink() {}
 
 void FileSink::BufferReady(int size, uint8* buffer) {
   if (size > copy_buf_size_) {
diff --git a/media/tools/omx_test/file_sink.h b/media/tools/omx_test/file_sink.h
index 69907031..5703600 100644
--- a/media/tools/omx_test/file_sink.h
+++ b/media/tools/omx_test/file_sink.h
@@ -21,17 +21,9 @@ class FileSink {
  public:
   FileSink(const FilePath& output_path,
            bool simulate_copy,
-           bool enable_csc)
-      : output_path_(output_path),
-        simulate_copy_(simulate_copy),
-        enable_csc_(enable_csc),
-        width_(0),
-        height_(0),
-        copy_buf_size_(0),
-        csc_buf_size_(0) {
-  }
-
-  virtual ~FileSink() {}
+           bool enable_csc);
+
+  virtual ~FileSink();
 
   virtual void BufferReady(int size, uint8* buffer);