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

Unified Diff: content/content_common.gypi

Issue 842123002: Support multiple video decoders and encoders (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add USE_V4L2_CODEC define Created 5 years, 11 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 | « content/common/gpu/media/v4l2_video_encode_accelerator.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 87f3015b52a2b499fc69ea819997d2b201eeb7d0..408bcf0b1efe836f9c0d813214b2cfaba791de4e 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -805,7 +805,12 @@
},
],
}],
- ['chromeos==1 and ((target_arch=="arm" and use_x11==1) or use_v4l2_codec==1)', {
+ ['chromeos==1 and use_v4l2_codec==1', {
+ 'defines': [
+ 'USE_V4L2_CODEC',
+ ],
+ }],
+ ['chromeos==1 and (target_arch=="arm" or (use_ozone==1 and use_v4l2_codec==1))', {
'dependencies': [
'../media/media.gyp:media',
],
« no previous file with comments | « content/common/gpu/media/v4l2_video_encode_accelerator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698