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

Unified Diff: media/media.gyp

Issue 2173153002: Reland2: H264 HW encode using MediaFoundation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added static_casts. Created 4 years, 5 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/gpu/video_encode_accelerator_unittest.cc ('k') | media/media_gpu.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 5ea6e73f630275374987e73c104ef4b08aae1896..463647f85fff98dcc66897cb82f4ab8a27749122 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1739,6 +1739,8 @@
'include_dirs': [ '..', ],
'defines': [ 'MF_INITIALIZER_IMPLEMENTATION', ],
'sources': [
+ 'base/win/mf_helpers.cc',
+ 'base/win/mf_helpers.h',
'base/win/mf_initializer_export.h',
'base/win/mf_initializer.cc',
'base/win/mf_initializer.h',
@@ -2132,7 +2134,7 @@
}
]
}],
- ['chromeos==1 or OS=="mac"', {
+ ['chromeos==1 or OS=="mac" or OS=="win"', {
'targets': [
{
'target_name': 'video_encode_accelerator_unittest',
@@ -2164,6 +2166,11 @@
'../third_party/webrtc/common_video/common_video.gyp:common_video',
],
}],
+ ['OS=="win"', {
+ 'dependencies': [
+ '../media/media.gyp:mf_initializer',
+ ],
+ }],
['use_x11==1', {
'dependencies': [
'../ui/gfx/x/gfx_x11.gyp:gfx_x11',
« no previous file with comments | « media/gpu/video_encode_accelerator_unittest.cc ('k') | media/media_gpu.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698