diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 19:09:28 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-10 19:09:28 +0000 |
| commit | d77ed9ef01dd6508ed6f153acbe71f95b9f38480 (patch) | |
| tree | e4da61afea4578827b57e411e284462e500293ee /media/build/media.vcproj | |
| parent | 8d439a694371cfdd95c0c03ff452c9096d3cc7f3 (diff) | |
| download | chromium_src-d77ed9ef01dd6508ed6f153acbe71f95b9f38480.zip chromium_src-d77ed9ef01dd6508ed6f153acbe71f95b9f38480.tar.gz chromium_src-d77ed9ef01dd6508ed6f153acbe71f95b9f38480.tar.bz2 | |
Checking in media::FFmpegGlue, media::FFmpegDemuxer and tests.
Fixes build break by including FFmpeg dependency for media project in chrome.sln.
This is a second attempt at committing the following changelists:
http://codereview.chromium.org/39295
http://codereview.chromium.org/28165
TBR=darin
Review URL: http://codereview.chromium.org/42029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11356 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/build/media.vcproj')
| -rw-r--r-- | media/build/media.vcproj | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/media/build/media.vcproj b/media/build/media.vcproj index d0b081f..37b7977 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,30 @@ > </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> |