diff options
| author | John Koleszar <jkoleszar@google.com> | 2012-01-27 14:08:27 -0800 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2012-01-27 14:08:40 -0800 |
| commit | 57cc35dd603491a90524c04ef23dfbbef3d1af5a (patch) | |
| tree | aa0fdf6528954930edd9ebdadebd9a390be2291c /vp8/encoder/arm/dct_arm.h | |
| parent | 2b0aee4b5def280d4e27c11d1b95ecd8545eed34 (diff) | |
| parent | 9951f461339559fb16b54395ebf570693dc29592 (diff) | |
| download | libvpx-57cc35dd603491a90524c04ef23dfbbef3d1af5a.tar libvpx-57cc35dd603491a90524c04ef23dfbbef3d1af5a.tar.gz libvpx-57cc35dd603491a90524c04ef23dfbbef3d1af5a.tar.bz2 libvpx-57cc35dd603491a90524c04ef23dfbbef3d1af5a.zip | |
Merge Duclair release into master branch
Change-Id: Ibf577972e8cd10488d44385ff74f136a07466c0c
Diffstat (limited to 'vp8/encoder/arm/dct_arm.h')
| -rw-r--r-- | vp8/encoder/arm/dct_arm.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp8/encoder/arm/dct_arm.h b/vp8/encoder/arm/dct_arm.h index db553c4e0..445f8e14e 100644 --- a/vp8/encoder/arm/dct_arm.h +++ b/vp8/encoder/arm/dct_arm.h @@ -12,7 +12,7 @@ #ifndef DCT_ARM_H #define DCT_ARM_H -#if HAVE_ARMV6 +#if HAVE_MEDIA extern prototype_fdct(vp8_short_walsh4x4_armv6); extern prototype_fdct(vp8_short_fdct4x4_armv6); extern prototype_fdct(vp8_short_fdct8x4_armv6); @@ -34,9 +34,9 @@ extern prototype_fdct(vp8_short_fdct8x4_armv6); #define vp8_fdct_fast8x4 vp8_short_fdct8x4_armv6 #endif -#endif /* HAVE_ARMV6 */ +#endif /* HAVE_MEDIA */ -#if HAVE_ARMV7 +#if HAVE_NEON extern prototype_fdct(vp8_short_fdct4x4_neon); extern prototype_fdct(vp8_short_fdct8x4_neon); extern prototype_fdct(vp8_fast_fdct4x4_neon); @@ -60,6 +60,6 @@ extern prototype_fdct(vp8_short_walsh4x4_neon); #define vp8_fdct_walsh_short4x4 vp8_short_walsh4x4_neon #endif -#endif +#endif /* HAVE_NEON */ #endif |