diff options
| author | Ben Murdoch <benm@google.com> | 2014-10-22 18:25:45 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-10-22 18:25:45 +0100 |
| commit | 5604da41b47ec06716a43fdef91273474ba1b915 (patch) | |
| tree | 392c5b03d8964d7b5b1bbc12aa34d6ce1f282fb1 | |
| parent | 3e24c89c8009a8ad0bc4f71d4c2ee8cbe45af939 (diff) | |
| parent | 9b39440429a9990f611201e957ad54d79b124a4f (diff) | |
| download | libyuv-5604da41b47ec06716a43fdef91273474ba1b915.tar.gz | |
Merge third_party/libyuv from https://chromium.googlesource.com/a/external/libyuv.git at 9b39440429a9990f611201e957ad54d79b124a4f
This commit was generated by merge_from_chromium.py.
Change-Id: I4037112a719777be60309d47adfef505cafb80eb
| -rw-r--r-- | README.chromium | 3 | ||||
| -rw-r--r-- | include/libyuv/row.h | 2 | ||||
| -rw-r--r-- | source/row_mips.cc | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/README.chromium b/README.chromium index e58eb6f..2f9a041 100644 --- a/README.chromium +++ b/README.chromium @@ -7,3 +7,6 @@ License File: LICENSE Description: libyuv is an open source project that includes YUV conversion and scaling functionality. + +Changes: +Patch r1067 into r1038 to disable mips dsp2 code on iso r6. diff --git a/include/libyuv/row.h b/include/libyuv/row.h index cdf6cec..99728cf 100644 --- a/include/libyuv/row.h +++ b/include/libyuv/row.h @@ -346,7 +346,7 @@ extern "C" { // The following are available on Mips platforms: #if !defined(LIBYUV_DISABLE_MIPS) && defined(__mips__) && \ - (_MIPS_SIM == _MIPS_SIM_ABI32) + (_MIPS_SIM == _MIPS_SIM_ABI32) && (__mips_isa_rev < 6) #define HAS_COPYROW_MIPS #if defined(__mips_dsp) && (__mips_dsp_rev >= 2) #define HAS_I422TOABGRROW_MIPS_DSPR2 diff --git a/source/row_mips.cc b/source/row_mips.cc index ae9370c..da7183b 100644 --- a/source/row_mips.cc +++ b/source/row_mips.cc @@ -378,7 +378,7 @@ void CopyRow_MIPS(const uint8* src, uint8* dst, int count) { // MIPS DSPR2 functions #if !defined(LIBYUV_DISABLE_MIPS) && defined(__mips_dsp) && \ (__mips_dsp_rev >= 2) && \ - (_MIPS_SIM == _MIPS_SIM_ABI32) + (_MIPS_SIM == _MIPS_SIM_ABI32) && (__mips_isa_rev < 6) void SplitUVRow_MIPS_DSPR2(const uint8* src_uv, uint8* dst_u, uint8* dst_v, int width) { |