summaryrefslogtreecommitdiff
path: root/common_video
diff options
context:
space:
mode:
authorandrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-01-29 06:45:22 +0000
committerandrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-01-29 06:45:22 +0000
commit2be6c3e0d17574aa1e19bdf46ab4f1b6cb025944 (patch)
treecc24ecd1776f9824607fd64f08de22a98865a60c /common_video
parentacb75d6cb80107288f99d1ce0fabf86ebd8d031a (diff)
downloadwebrtc-2be6c3e0d17574aa1e19bdf46ab4f1b6cb025944.tar.gz
Fix webrtc compilation errors for Chrome Win64
Mostly disabling warnings in the gyp files. BUG=1348 BUG=http://crbug.com/166496 BUG=http://crbug.com/167187 Review URL: https://webrtc-codereview.appspot.com/1063011 Patch from Justin Schuh <jschuh@chromium.org>. git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3423 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'common_video')
-rw-r--r--common_video/common_video.gyp2
1 files changed, 2 insertions, 0 deletions
diff --git a/common_video/common_video.gyp b/common_video/common_video.gyp
index d8f2a3f5..36e2ee5b 100644
--- a/common_video/common_video.gyp
+++ b/common_video/common_video.gyp
@@ -66,6 +66,8 @@
'plane.h',
'plane.cc',
],
+ # Silence jpeg struct padding warnings.
+ 'msvs_disabled_warnings': [ 4324, ],
},
], # targets
'conditions': [