diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-01 14:38:43 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2015-09-01 19:06:58 -0700 |
| commit | 2f4971610f2bd8ee8210795724bb691524a6c5d5 (patch) | |
| tree | ea8a34f0c122aa4bef66f521a456d1c016688468 | |
| parent | 69f5594ef6a4a13fac8b001421b302a9a0b4a009 (diff) | |
| download | android_external_libvpx-2f4971610f2bd8ee8210795724bb691524a6c5d5.tar.gz android_external_libvpx-2f4971610f2bd8ee8210795724bb691524a6c5d5.tar.bz2 android_external_libvpx-2f4971610f2bd8ee8210795724bb691524a6c5d5.zip | |
Try to CP ag/749963 from klp-dev into lmp-mr1-release
Bug: 22943772
| -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; # |