summaryrefslogtreecommitdiffstats
path: root/media/media.gyp
diff options
context:
space:
mode:
authoracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-29 21:12:50 +0000
committeracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-29 21:12:50 +0000
commiteb54c5b4da5ab9c4d50cb619de0dc8baff60e9dd (patch)
tree698c322622f993ea2d38ae2346bb5b43a5824f03 /media/media.gyp
parent74e9fa2c35b2fa8d293ad5369cc9cb6e9bbad2a1 (diff)
downloadchromium_src-eb54c5b4da5ab9c4d50cb619de0dc8baff60e9dd.zip
chromium_src-eb54c5b4da5ab9c4d50cb619de0dc8baff60e9dd.tar.gz
chromium_src-eb54c5b4da5ab9c4d50cb619de0dc8baff60e9dd.tar.bz2
Revert 70275 - Revert 70267 - Refactor PipelineImpl to use CompositeFilter to manage Filter state transitions.
BUG=54110 TEST=media_unittests CompositeFilterTest.* Review URL: http://codereview.chromium.org/5744002 TBR=acolwell@chromium.org Review URL: http://codereview.chromium.org/6026013 TBR=acolwell@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70277 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
-rw-r--r--media/media.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp
index 6fe8e83..0331a77 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -76,6 +76,8 @@
'base/clock.h',
'base/clock_impl.cc',
'base/clock_impl.h',
+ 'base/composite_filter.cc',
+ 'base/composite_filter.h',
'base/data_buffer.cc',
'base/data_buffer.h',
'base/djb2.cc',
@@ -269,6 +271,7 @@
'audio/mac/audio_output_mac_unittest.cc',
'audio/simple_sources_unittest.cc',
'audio/win/audio_output_win_unittest.cc',
+ 'base/composite_filter_unittest.cc',
'base/clock_impl_unittest.cc',
'base/data_buffer_unittest.cc',
'base/djb2_unittest.cc',