diff options
| author | Wei Jia <wjia@google.com> | 2015-08-17 15:15:36 -0700 |
|---|---|---|
| committer | Wei Jia <wjia@google.com> | 2015-08-17 15:15:36 -0700 |
| commit | 217c6ceb16a7ec83f027e1963ba9cbe542097179 (patch) | |
| tree | 7fa223597368a310d859b0bfad9eee9740bfaa7a | |
| parent | 4fb68e5dd4e93c7599dc905d861de11ac39c5585 (diff) | |
| parent | efc44fee7c71536f1f169f705cb81d99c8777ca2 (diff) | |
| download | android_external_libvpx-217c6ceb16a7ec83f027e1963ba9cbe542097179.tar.gz android_external_libvpx-217c6ceb16a7ec83f027e1963ba9cbe542097179.tar.bz2 android_external_libvpx-217c6ceb16a7ec83f027e1963ba9cbe542097179.zip | |
Merge commit 'efc44fee' into HEAD
Change-Id: I850a320e2231f641bb0164398f1fb04555874a56
| -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; # |