diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 18:41:52 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 18:41:52 +0000 |
| commit | b4fc9c198c85039e15907ccbf99f4d7259d2f085 (patch) | |
| tree | 6db743d01149a07b1443f91f7a8ee39a859341ff /media/build | |
| parent | 11e53f69d052482f9a34b4d67ea6e531a7c0edaf (diff) | |
| download | chromium_src-b4fc9c198c85039e15907ccbf99f4d7259d2f085.zip chromium_src-b4fc9c198c85039e15907ccbf99f4d7259d2f085.tar.gz chromium_src-b4fc9c198c85039e15907ccbf99f4d7259d2f085.tar.bz2 | |
Revert "Checking in media::FFmpegDemuxer and tests."
Review URL: http://codereview.chromium.org/43032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11350 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/build')
| -rw-r--r-- | media/build/media.vcproj | 28 | ||||
| -rw-r--r-- | media/build/media_unittests.vcproj | 12 |
2 files changed, 4 insertions, 36 deletions
diff --git a/media/build/media.vcproj b/media/build/media.vcproj index 37b7977..d0b081f 100644 --- a/media/build/media.vcproj +++ b/media/build/media.vcproj @@ -18,7 +18,7 @@ <Configuration Name="Debug|Win32" ConfigurationType="4" - InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)..\third_party\ffmpeg\using_ffmpeg.vsprops" + InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops" > <Tool Name="VCPreBuildEventTool" @@ -69,7 +69,7 @@ <Configuration Name="Release|Win32" ConfigurationType="4" - InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;$(SolutionDir)..\third_party\ffmpeg\using_ffmpeg.vsprops" + InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops" > <Tool Name="VCPreBuildEventTool" @@ -213,30 +213,6 @@ > </File> <File - RelativePath="..\filters\ffmpeg_common.cc" - > - </File> - <File - RelativePath="..\filters\ffmpeg_common.h" - > - </File> - <File - RelativePath="..\filters\ffmpeg_demuxer.cc" - > - </File> - <File - RelativePath="..\filters\ffmpeg_demuxer.h" - > - </File> - <File - RelativePath="..\filters\ffmpeg_glue.cc" - > - </File> - <File - RelativePath="..\filters\ffmpeg_glue.h" - > - </File> - <File RelativePath="..\filters\file_data_source.cc" > </File> diff --git a/media/build/media_unittests.vcproj b/media/build/media_unittests.vcproj index 4e18337..db414e7 100644 --- a/media/build/media_unittests.vcproj +++ b/media/build/media_unittests.vcproj @@ -18,7 +18,7 @@ <Configuration Name="Debug|Win32" ConfigurationType="1" - InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;$(SolutionDir)..\third_party\ffmpeg\using_ffmpeg.vsprops" + InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops" > <Tool Name="VCPreBuildEventTool" @@ -79,7 +79,7 @@ <Configuration Name="Release|Win32" ConfigurationType="1" - InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;$(SolutionDir)..\third_party\ffmpeg\using_ffmpeg.vsprops" + InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops" > <Tool Name="VCPreBuildEventTool" @@ -192,14 +192,6 @@ Name="filters" > <File - RelativePath="..\filters\ffmpeg_demuxer_unittest.cc" - > - </File> - <File - RelativePath="..\filters\ffmpeg_glue_unittest.cc" - > - </File> - <File RelativePath="..\filters\file_data_source_unittest.cc" > </File> |