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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/media_nacl.gyp

Issue 1141703002: Chromium changes for static linking ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Roll DEPS to fix cros, rebase. Created 5 years, 6 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/media.gyp ('k') | media/media_unittests.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media_nacl.gyp
diff --git a/media/media_nacl.gyp b/media/media_nacl.gyp
index 9697a8a21f05ccaa687dddbcf6d290ca1c5390d4..f345376f658d8e7137f7cb5beb302f98c8855b62 100644
--- a/media/media_nacl.gyp
+++ b/media/media_nacl.gyp
@@ -53,7 +53,6 @@
'sources': [
'base/media.cc',
'base/media.h',
- 'base/media_stub.cc',
'base/simd/convert_rgb_to_yuv.h',
'base/simd/convert_rgb_to_yuv_c.cc',
'base/simd/convert_yuv_to_rgb.h',
@@ -63,6 +62,9 @@
'base/yuv_convert.cc',
'base/yuv_convert.h',
],
+ 'defines': [
+ 'MEDIA_DISABLE_FFMPEG',
+ ],
}, # end of target 'media_yuv_nacl'
],
}],
« no previous file with comments | « media/media.gyp ('k') | media/media_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698