diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-16 18:10:42 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-16 18:10:42 +0000 |
| commit | 92e4afc1fbcb3850b505e5caceabbbcca491974a (patch) | |
| tree | 8068f2be68df618aade295db81e5be32aeb1b13f /media/media.gyp | |
| parent | 3d143e9b4beec02c615bd47a6a267a0ba24992cd (diff) | |
| download | chromium_src-92e4afc1fbcb3850b505e5caceabbbcca491974a.zip chromium_src-92e4afc1fbcb3850b505e5caceabbbcca491974a.tar.gz chromium_src-92e4afc1fbcb3850b505e5caceabbbcca491974a.tar.bz2 | |
Revert 96974 - Remove mock_ffmpeg and update media unittests.
BUG=92429
TEST=BitstreamConverterTest.*, ChunkDemuxerTest.*, FFmpegDemuxerTest.*, FFmpegGlueTest.*, FFmpegVideoDecoderTest.*, FFmpegH264BitstreamConverterTest.*, FFmpegVideoDecodeEngineTest.*
Review URL: http://codereview.chromium.org/7587012
TBR=acolwell@chromium.org
Review URL: http://codereview.chromium.org/7658017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/media.gyp b/media/media.gyp index 600df2a..d93ad41 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -417,6 +417,8 @@ 'base/djb2_unittest.cc', 'base/filter_collection_unittest.cc', 'base/h264_bitstream_converter_unittest.cc', + 'base/mock_ffmpeg.cc', + 'base/mock_ffmpeg.h', 'base/mock_reader.h', 'base/mock_task.cc', 'base/mock_task.h', @@ -426,8 +428,6 @@ 'base/run_all_unittests.cc', 'base/seekable_buffer_unittest.cc', 'base/state_matrix_unittest.cc', - 'base/test_data_util.cc', - 'base/test_data_util.h', 'base/video_frame_unittest.cc', 'base/video_util_unittest.cc', 'base/yuv_convert_unittest.cc', |