diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 17:58:40 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 17:58:40 +0000 |
| commit | 048539b80280b675fb545ad846e3b912da1c7a0f (patch) | |
| tree | bec176a345363da5145c4f4e001d229d8d3f5f73 /media/build | |
| parent | dafd23c752513be80b430d1b9e97fab0ec68c54a (diff) | |
| download | chromium_src-048539b80280b675fb545ad846e3b912da1c7a0f.zip chromium_src-048539b80280b675fb545ad846e3b912da1c7a0f.tar.gz chromium_src-048539b80280b675fb545ad846e3b912da1c7a0f.tar.bz2 | |
Checking in media::FFmpegGlue and some common FFmpeg code.
FFmpegGlue acts as an adapter between FFmpeg's URLProtocol and the media::DataSource interface, allowing us to use media::DataSource implementations for handling FFmpeg's IO.
Review URL: http://codereview.chromium.org/28165
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/build')
| -rw-r--r-- | media/build/media.vcproj | 20 | ||||
| -rw-r--r-- | media/build/media_unittests.vcproj | 8 |
2 files changed, 24 insertions, 4 deletions
diff --git a/media/build/media.vcproj b/media/build/media.vcproj index d0b081f..d0a78f6 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" + InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)..\third_party\ffmpeg\using_ffmpeg.vsprops" > <Tool Name="VCPreBuildEventTool" @@ -69,7 +69,7 @@ <Configuration Name="Release|Win32" ConfigurationType="4" - InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops" + InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;$(SolutionDir)..\third_party\ffmpeg\using_ffmpeg.vsprops" > <Tool Name="VCPreBuildEventTool" @@ -213,6 +213,22 @@ > </File> <File + RelativePath="..\filters\ffmpeg_common.cc" + > + </File> + <File + RelativePath="..\filters\ffmpeg_common.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 db414e7..214bab6d3 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" + InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;$(SolutionDir)..\third_party\ffmpeg\using_ffmpeg.vsprops" > <Tool Name="VCPreBuildEventTool" @@ -79,7 +79,7 @@ <Configuration Name="Release|Win32" ConfigurationType="1" - InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops" + InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;$(SolutionDir)..\third_party\ffmpeg\using_ffmpeg.vsprops" > <Tool Name="VCPreBuildEventTool" @@ -192,6 +192,10 @@ Name="filters" > <File + RelativePath="..\filters\ffmpeg_glue_unittest.cc" + > + </File> + <File RelativePath="..\filters\file_data_source_unittest.cc" > </File> |