Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(265)

Unified Diff: media/build/media.vcproj

Issue 42029: Checking in media::FFmpegGlue, media::FFmpegDemuxer and tests. (Closed)
Patch Set: Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/pipeline.h ('k') | media/build/media_unittests.vcproj » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/build/media.vcproj
diff --git a/media/build/media.vcproj b/media/build/media.vcproj
index d0b081ffef182e9e06def19423d43ec5266e73fa..37b7977a75ad306280991758107cb2cfd6993ee4 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>
« no previous file with comments | « media/base/pipeline.h ('k') | media/build/media_unittests.vcproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698