summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-06 10:38:47 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-06 10:38:47 +0000
commitfd146835762ea78ac9a9b87f7e489fc64357d2ad (patch)
treeabf845563cdd80f1e643a77407da264a4621167e /third_party
parent4950ea06017b4c727edc367f30c1bc9c2c68fee6 (diff)
downloadchromium_src-fd146835762ea78ac9a9b87f7e489fc64357d2ad.zip
chromium_src-fd146835762ea78ac9a9b87f7e489fc64357d2ad.tar.gz
chromium_src-fd146835762ea78ac9a9b87f7e489fc64357d2ad.tar.bz2
Chromoting client: video renderer based on MediaSource API.
The new render is not enabled yet by default, but can be enabled using remoting.settings.USE_MEDIA_SOURCE_RENDERING flag in the webapp. BUG=321825 Review URL: https://codereview.chromium.org/134163005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249338 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/libwebm/libwebm.gyp8
1 files changed, 7 insertions, 1 deletions
diff --git a/third_party/libwebm/libwebm.gyp b/third_party/libwebm/libwebm.gyp
index e277407..2374d67 100644
--- a/third_party/libwebm/libwebm.gyp
+++ b/third_party/libwebm/libwebm.gyp
@@ -12,7 +12,13 @@
'type': 'static_library',
'sources': [
'<@(libwebm_sources)'
- ]
+ ],
+ 'defines!': [
+ # This macro is declared in common.gypi which causes warning when
+ # compiling mkvmuxerutil.cpp which also defines it.
+ '_CRT_RAND_S',
+ ],
+ 'msvs_disabled_warnings': [ 4267 ],
}, # target libwebm
]
}