diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-02-18 00:05:13 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-02-18 00:05:13 -0500 |
| commit | f13212b72817ec5e8ec90f8375b98d1515eab27b (patch) | |
| tree | c5cb709d408e0f9ef451c78a90a213ac3165753b /vp8/decoder/arm | |
| parent | 95a86dd007ee53170a25e8406c1d09e40cdbe78a (diff) | |
| parent | b2ae57f1b6cbbf018d356528bd8e816752dbbfb7 (diff) | |
| download | libvpx-f13212b72817ec5e8ec90f8375b98d1515eab27b.tar libvpx-f13212b72817ec5e8ec90f8375b98d1515eab27b.tar.gz libvpx-f13212b72817ec5e8ec90f8375b98d1515eab27b.tar.bz2 libvpx-f13212b72817ec5e8ec90f8375b98d1515eab27b.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/decoder/arm')
| -rw-r--r-- | vp8/decoder/arm/arm_dsystemdependent.c | 10 | ||||
| -rw-r--r-- | vp8/decoder/arm/armv6/idct_blk_v6.c | 4 | ||||
| -rw-r--r-- | vp8/decoder/arm/dequantize_arm.c | 6 | ||||
| -rw-r--r-- | vp8/decoder/arm/neon/idct_blk_neon.c | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/vp8/decoder/arm/arm_dsystemdependent.c b/vp8/decoder/arm/arm_dsystemdependent.c index 02e45d170..51e901d79 100644 --- a/vp8/decoder/arm/arm_dsystemdependent.c +++ b/vp8/decoder/arm/arm_dsystemdependent.c @@ -11,11 +11,11 @@ #include "vpx_ports/config.h" #include "vpx_ports/arm.h" -#include "blockd.h" -#include "pragmas.h" -#include "postproc.h" -#include "dequantize.h" -#include "onyxd_int.h" +#include "vp8/common/blockd.h" +#include "vp8/common/pragmas.h" +#include "vp8/common/postproc.h" +#include "vp8/decoder/dequantize.h" +#include "vp8/decoder/onyxd_int.h" void vp8_arch_arm_decode_init(VP8D_COMP *pbi) { diff --git a/vp8/decoder/arm/armv6/idct_blk_v6.c b/vp8/decoder/arm/armv6/idct_blk_v6.c index 3c7bc502f..57c344698 100644 --- a/vp8/decoder/arm/armv6/idct_blk_v6.c +++ b/vp8/decoder/arm/armv6/idct_blk_v6.c @@ -9,8 +9,8 @@ */ #include "vpx_ports/config.h" -#include "idct.h" -#include "dequantize.h" +#include "vp8/common/idct.h" +#include "vp8/decoder/dequantize.h" void vp8_dequant_dc_idct_add_y_block_v6 (short *q, short *dq, unsigned char *pre, diff --git a/vp8/decoder/arm/dequantize_arm.c b/vp8/decoder/arm/dequantize_arm.c index b3e14b793..b26af975f 100644 --- a/vp8/decoder/arm/dequantize_arm.c +++ b/vp8/decoder/arm/dequantize_arm.c @@ -10,9 +10,9 @@ #include "vpx_ports/config.h" -#include "dequantize.h" -#include "predictdc.h" -#include "idct.h" +#include "vp8/decoder/dequantize.h" +#include "vp8/common/predictdc.h" +#include "vp8/common/idct.h" #include "vpx_mem/vpx_mem.h" #if HAVE_ARMV7 diff --git a/vp8/decoder/arm/neon/idct_blk_neon.c b/vp8/decoder/arm/neon/idct_blk_neon.c index fe4f2e0d4..ee3500425 100644 --- a/vp8/decoder/arm/neon/idct_blk_neon.c +++ b/vp8/decoder/arm/neon/idct_blk_neon.c @@ -9,8 +9,8 @@ */ #include "vpx_ports/config.h" -#include "idct.h" -#include "dequantize.h" +#include "vp8/common/idct.h" +#include "vp8/decoder/dequantize.h" /* place these declarations here because we don't want to maintain them * outside of this scope |