projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
libyuv
/
source
/
row_common.cc
diff --git
a/src/third_party/libyuv/source/row_common.cc
b/src/third_party/libyuv/source/row_common.cc
index
87d877a
..
135bdc9
100644
(file)
--- a/
src/third_party/libyuv/source/row_common.cc
+++ b/
src/third_party/libyuv/source/row_common.cc
@@
-2024,7
+2024,7
@@
void I422ToUYVYRow_C(const uint8* src_y,
#if !defined(LIBYUV_DISABLE_X86) && defined(HAS_I422TOARGBROW_SSSE3)
// row_win.cc has asm version, but GCC uses 2 step wrapper.
#if !defined(LIBYUV_DISABLE_X86) && defined(HAS_I422TOARGBROW_SSSE3)
// row_win.cc has asm version, but GCC uses 2 step wrapper.
-#if
defined(__x86_64__) || defined(__i386__
)
+#if
!defined(_MSC_VER) && (defined(__x86_64__) || defined(__i386__)
)
void I422ToRGB565Row_SSSE3(const uint8* src_y,
const uint8* src_u,
const uint8* src_v,
void I422ToRGB565Row_SSSE3(const uint8* src_y,
const uint8* src_u,
const uint8* src_v,
@@
-2036,7
+2036,7
@@
void I422ToRGB565Row_SSSE3(const uint8* src_y,
ARGBToRGB565Row_SSE2(row, rgb_buf, width);
free_aligned_buffer_64(row);
}
ARGBToRGB565Row_SSE2(row, rgb_buf, width);
free_aligned_buffer_64(row);
}
-#endif //
defined(__x86_64__) || defined(__i386__
)
+#endif //
!defined(_MSC_VER) && (defined(__x86_64__) || defined(__i386__)
)
#if defined(_M_IX86) || defined(__x86_64__) || defined(__i386__)
void I422ToARGB1555Row_SSSE3(const uint8* src_y,
#if defined(_M_IX86) || defined(__x86_64__) || defined(__i386__)
void I422ToARGB1555Row_SSSE3(const uint8* src_y,