summaryrefslogtreecommitdiff
path: root/third_party/libyuv/source/mjpeg_decoder.cc
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/libyuv/source/mjpeg_decoder.cc')
-rw-r--r--third_party/libyuv/source/mjpeg_decoder.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/third_party/libyuv/source/mjpeg_decoder.cc b/third_party/libyuv/source/mjpeg_decoder.cc
index 36028c3cc..75f8a610e 100644
--- a/third_party/libyuv/source/mjpeg_decoder.cc
+++ b/third_party/libyuv/source/mjpeg_decoder.cc
@@ -18,6 +18,12 @@
// Must be included before jpeglib.
#include <setjmp.h>
#define HAVE_SETJMP
+
+#if defined(_MSC_VER)
+// disable warning 4324: structure was padded due to __declspec(align())
+#pragma warning(disable:4324)
+#endif
+
#endif
struct FILE; // For jpeglib.h.