summaryrefslogtreecommitdiff
path: root/third_party/libyuv/source/mjpeg_validate.cc
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2015-07-24 16:54:51 -0700
committerJames Zern <jzern@google.com>2015-07-31 18:34:20 -0700
commitfcb4253c9cdaece2dd3a2ab8c6842ed41e24f123 (patch)
treea61c7507bfd7c9f36cf2899409c3c883f4f5474b /third_party/libyuv/source/mjpeg_validate.cc
parentf42012e526f218f4607e5d678c5bd44bb5978bff (diff)
downloadlibvpx-fcb4253c9cdaece2dd3a2ab8c6842ed41e24f123.tar
libvpx-fcb4253c9cdaece2dd3a2ab8c6842ed41e24f123.tar.gz
libvpx-fcb4253c9cdaece2dd3a2ab8c6842ed41e24f123.tar.bz2
libvpx-fcb4253c9cdaece2dd3a2ab8c6842ed41e24f123.zip
update libyuv to r1456
picks up build warning fixes for visual studio 2015 Change-Id: Idea85fa70d1aeb2a46ea355b87fe41ec5b2b9520
Diffstat (limited to 'third_party/libyuv/source/mjpeg_validate.cc')
-rw-r--r--third_party/libyuv/source/mjpeg_validate.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/libyuv/source/mjpeg_validate.cc b/third_party/libyuv/source/mjpeg_validate.cc
index 40ce2f787..8edfbe1e7 100644
--- a/third_party/libyuv/source/mjpeg_validate.cc
+++ b/third_party/libyuv/source/mjpeg_validate.cc
@@ -23,7 +23,7 @@ extern "C" {
#ifdef ENABLE_SCASB
// Multiple of 1.
-__declspec(naked) __declspec(align(16))
+__declspec(naked)
const uint8* ScanRow_ERMS(const uint8* src, uint32 val, int count) {
__asm {
mov edx, edi