diff options
| author | James Zern <jzern@google.com> | 2014-08-10 16:15:18 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2014-08-12 22:54:05 -0700 |
| commit | 3a7d467da9f432f010470b7ae39e5bd7c9247323 (patch) | |
| tree | 587d4b69ab3b43123ccda2305da64d81ac06a92a /third_party/libyuv/source/planar_functions.cc | |
| parent | ccddd5d0f9a69c7369f9a68c155577e4e0b3afd1 (diff) | |
| download | libvpx-3a7d467da9f432f010470b7ae39e5bd7c9247323.tar libvpx-3a7d467da9f432f010470b7ae39e5bd7c9247323.tar.gz libvpx-3a7d467da9f432f010470b7ae39e5bd7c9247323.tar.bz2 libvpx-3a7d467da9f432f010470b7ae39e5bd7c9247323.zip | |
libyuv: update to r1041
Change-Id: I38dad398844ee424a7a92a745ab703645018d02b
Diffstat (limited to 'third_party/libyuv/source/planar_functions.cc')
| -rw-r--r-- | third_party/libyuv/source/planar_functions.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/third_party/libyuv/source/planar_functions.cc b/third_party/libyuv/source/planar_functions.cc index 68b8f46e4..3857008ca 100644 --- a/third_party/libyuv/source/planar_functions.cc +++ b/third_party/libyuv/source/planar_functions.cc @@ -8,15 +8,15 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "third_party/libyuv/include/libyuv/planar_functions.h" +#include "libyuv/planar_functions.h" #include <string.h> // for memset() -#include "third_party/libyuv/include/libyuv/cpu_id.h" +#include "libyuv/cpu_id.h" #ifdef HAVE_JPEG -#include "third_party/libyuv/include/libyuv/mjpeg_decoder.h" +#include "libyuv/mjpeg_decoder.h" #endif -#include "third_party/libyuv/include/libyuv/row.h" +#include "libyuv/row.h" #ifdef __cplusplus namespace libyuv { @@ -37,6 +37,10 @@ void CopyPlane(const uint8* src_y, int src_stride_y, height = 1; src_stride_y = dst_stride_y = 0; } + // Nothing to do. + if (src_y == dst_y && src_stride_y == dst_stride_y) { + return; + } #if defined(HAS_COPYROW_X86) if (TestCpuFlag(kCpuHasX86) && IS_ALIGNED(width, 4)) { CopyRow = CopyRow_X86; |