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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content_common.gypi

Issue 826663002: Support multiple video decoders and encoders (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix nits Created 6 years 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
« content/common/gpu/media/v4l2_video_decode_accelerator.cc ('K') | « content/common/gpu/media/v4l2_video_decode_accelerator.cc ('k') | media/video/video_encode_accelerator.h » ('j') | media/video/video_encode_accelerator.h » ('J')
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 e32344fe64848c9d57a224538c64311c2619a12e..19fdff712b6661a44a0008e9bdd66a6661b01cb0 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -756,7 +756,7 @@
'../third_party/libjingle/libjingle.gyp:libjingle',
],
}],
- ['target_arch=="arm" and chromeos == 1 and use_x11 == 1', {
+ ['chromeos == 1 and use_x11 == 1', {
'dependencies': [
'../media/media.gyp:media',
],
« content/common/gpu/media/v4l2_video_decode_accelerator.cc ('K') | « content/common/gpu/media/v4l2_video_decode_accelerator.cc ('k') | media/video/video_encode_accelerator.h » ('j') | media/video/video_encode_accelerator.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698