source/libvpx/third_party/libyuv/source/mjpeg_decoder.cc - Issue 1302353004: libvpx: Pull from upstream

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: source/libvpx/third_party/libyuv/source/mjpeg_decoder.cc

Issue 1302353004: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master

Patch Set: Created 5 years, 4 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:

Index: source/libvpx/third_party/libyuv/source/mjpeg_decoder.cc

diff --git a/source/libvpx/third_party/libyuv/source/mjpeg_decoder.cc b/source/libvpx/third_party/libyuv/source/mjpeg_decoder.cc

index 36028c3cc2fb987824663b4c6c86e70a3b3a6f53..75f8a610e317ee878c7d30f80721cf436a4881a7 100644

--- a/source/libvpx/third_party/libyuv/source/mjpeg_decoder.cc

+++ b/source/libvpx/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.