diff options
author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-10-05 20:18:29 +0100 |
---|---|---|
committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-10-05 20:18:29 +0100 |
commit | 0b30efb816b1405c47dacab0661976cd2a0510ad (patch) | |
tree | 56340f4c62fb586cbf0e9faf3f193cbc28f375f4 | |
parent | bd6949aaeaf7af7466847bafc49dd975fa629f04 (diff) | |
parent | 2f4971610f2bd8ee8210795724bb691524a6c5d5 (diff) | |
download | android_external_libvpx-0b30efb816b1405c47dacab0661976cd2a0510ad.tar.gz android_external_libvpx-0b30efb816b1405c47dacab0661976cd2a0510ad.tar.bz2 android_external_libvpx-0b30efb816b1405c47dacab0661976cd2a0510ad.zip |
Merge tag 'android-5.1.1_r23' into cm-12.1
Android 5.1.1 release 23
-rw-r--r-- | armv7a-neon/vp8_rtcd.h | 3 | ||||
-rw-r--r-- | libvpx/vp8/common/rtcd_defs.pl | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/armv7a-neon/vp8_rtcd.h b/armv7a-neon/vp8_rtcd.h index 17c08b6..d1741c5 100644 --- a/armv7a-neon/vp8_rtcd.h +++ b/armv7a-neon/vp8_rtcd.h @@ -33,8 +33,7 @@ void vp8_bilinear_predict16x16_neon(unsigned char *src, int src_pitch, int xofst void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); void vp8_bilinear_predict4x4_armv6(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); -void vp8_bilinear_predict4x4_neon(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); -#define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_neon +#define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_armv6 void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); void vp8_bilinear_predict8x4_armv6(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); diff --git a/libvpx/vp8/common/rtcd_defs.pl b/libvpx/vp8/common/rtcd_defs.pl index 130d965..9bf1556 100644 --- a/libvpx/vp8/common/rtcd_defs.pl +++ b/libvpx/vp8/common/rtcd_defs.pl @@ -233,7 +233,7 @@ specialize qw/vp8_bilinear_predict8x4 mmx media neon/; $vp8_bilinear_predict8x4_media=vp8_bilinear_predict8x4_armv6; add_proto qw/void vp8_bilinear_predict4x4/, "unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch"; -specialize qw/vp8_bilinear_predict4x4 mmx media neon/; +specialize qw/vp8_bilinear_predict4x4 mmx media/; $vp8_bilinear_predict4x4_media=vp8_bilinear_predict4x4_armv6; # |