summaryrefslogtreecommitdiffstats
path: root/media/build
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-16 21:46:10 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-16 21:46:10 +0000
commitd8a447c5f7eef2dfe00a2a80466288be0d7329f7 (patch)
tree81378251205188e2718b4fc73282e62beca1c624 /media/build
parentf7842f9049b7c2a16e29f01d713685ab32cd4c47 (diff)
downloadchromium_src-d8a447c5f7eef2dfe00a2a80466288be0d7329f7.zip
chromium_src-d8a447c5f7eef2dfe00a2a80466288be0d7329f7.tar.gz
chromium_src-d8a447c5f7eef2dfe00a2a80466288be0d7329f7.tar.bz2
Checking in media::DataBuffer, a simple implementation of WritableBufferInterface.
Removed media/base/media.cc, since it's no longer needed to generate media.lib. Also added media/using_media.scons and updated scons files for Linux build. Review URL: http://codereview.chromium.org/13682 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7099 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/build')
-rw-r--r--media/build/media.vcproj8
-rw-r--r--media/build/media_unittests.vcproj12
2 files changed, 18 insertions, 2 deletions
diff --git a/media/build/media.vcproj b/media/build/media.vcproj
index 53f38ea..55a4556 100644
--- a/media/build/media.vcproj
+++ b/media/build/media.vcproj
@@ -129,11 +129,15 @@
>
</File>
<File
- RelativePath="..\base\filters.h"
+ RelativePath="..\base\data_buffer.cc"
>
</File>
<File
- RelativePath="..\base\media.cc"
+ RelativePath="..\base\data_buffer.h"
+ >
+ </File>
+ <File
+ RelativePath="..\base\filters.h"
>
</File>
<File
diff --git a/media/build/media_unittests.vcproj b/media/build/media_unittests.vcproj
index f814142..82347fc 100644
--- a/media/build/media_unittests.vcproj
+++ b/media/build/media_unittests.vcproj
@@ -149,6 +149,18 @@
>
</File>
</Filter>
+ <Filter
+ Name="tests"
+ >
+ <Filter
+ Name="base"
+ >
+ <File
+ RelativePath="..\base\data_buffer_unittest.cc"
+ >
+ </File>
+ </Filter>
+ </Filter>
</Files>
<Globals>
</Globals>