diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-12 01:13:27 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-12 01:13:27 +0000 |
| commit | 7712c3f67657e15d8702ffdd2b6a761c7bca25b1 (patch) | |
| tree | 093931804895d2a1d33a0d5ef1c6c077814a3373 /media/tools/omx_test/file_reader_util.h | |
| parent | dcafaefb3097412bacafb3c248149f427e6b0fcc (diff) | |
| download | chromium_src-7712c3f67657e15d8702ffdd2b6a761c7bca25b1.zip chromium_src-7712c3f67657e15d8702ffdd2b6a761c7bca25b1.tar.gz chromium_src-7712c3f67657e15d8702ffdd2b6a761c7bca25b1.tar.bz2 | |
Revert 74700 - Revert the "out-of-lining of test code" change within src/media
to see if it fixes the gmock crashes we've been seeing since the
change has been made.
The original change was split between r74660, r74168, r74059
Review URL: http://codereview.chromium.org/6473006
TBR=nsylvain@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74712 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools/omx_test/file_reader_util.h')
| -rw-r--r-- | media/tools/omx_test/file_reader_util.h | 3 |
1 files changed, 3 insertions, 0 deletions
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: |