diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-02-18 00:05:10 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-02-18 00:05:11 -0500 |
| commit | 4fafc4d985debd3e9ec41b1c0ab447e32d2a9db9 (patch) | |
| tree | 0f2ef2149af110a2ba2b581b7d498eb9b3f6e9ab /vp8/common/arm/neon/recon_neon.c | |
| parent | 129311689577edc570ee89049ce4f4867a87df24 (diff) | |
| parent | b2ae57f1b6cbbf018d356528bd8e816752dbbfb7 (diff) | |
| download | libvpx-4fafc4d985debd3e9ec41b1c0ab447e32d2a9db9.tar libvpx-4fafc4d985debd3e9ec41b1c0ab447e32d2a9db9.tar.gz libvpx-4fafc4d985debd3e9ec41b1c0ab447e32d2a9db9.tar.bz2 libvpx-4fafc4d985debd3e9ec41b1c0ab447e32d2a9db9.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: I8999a33db82d38eb85482f3c423db238d6ee3ed9
Diffstat (limited to 'vp8/common/arm/neon/recon_neon.c')
| -rw-r--r-- | vp8/common/arm/neon/recon_neon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/common/arm/neon/recon_neon.c b/vp8/common/arm/neon/recon_neon.c index f7930ee5f..09fd2a56f 100644 --- a/vp8/common/arm/neon/recon_neon.c +++ b/vp8/common/arm/neon/recon_neon.c @@ -10,8 +10,8 @@ #include "vpx_ports/config.h" -#include "recon.h" -#include "blockd.h" +#include "vp8/common/recon.h" +#include "vp8/common/blockd.h" extern void vp8_recon16x16mb_neon(unsigned char *pred_ptr, short *diff_ptr, unsigned char *dst_ptr, int ystride, unsigned char *udst_ptr, unsigned char *vdst_ptr); |