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

Unified Diff: media/build/media_unittests.vcproj

Issue 28165: Checking in media::FFmpegGlue and some common FFmpeg code. (Closed)
Patch Set: mime type stuff Created 11 years, 10 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/build/media.vcproj ('k') | media/filters/ffmpeg_common.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/build/media_unittests.vcproj
diff --git a/media/build/media_unittests.vcproj b/media/build/media_unittests.vcproj
index db414e74334a4fe549a4c891c4616f579f53dd61..837a9d285a933115ade9f8597ae4f7a2c1665662 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,10 +192,18 @@
Name="filters"
>
<File
+ RelativePath="..\filters\ffmpeg_glue_unittest.cc"
+ >
+ </File>
+ <File
RelativePath="..\filters\file_data_source_unittest.cc"
>
</File>
<File
+ RelativePath="..\filters\mock_data_source.h"
+ >
+ </File>
+ <File
RelativePath="..\filters\test_video_renderer.h"
>
</File>
« no previous file with comments | « media/build/media.vcproj ('k') | media/filters/ffmpeg_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698