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-02 18:10:22 -0700 |
| commit | e49adbeb81193107c319f8e49840acec07afc6fa (patch) | |
| tree | 24ac4becc08f241b9497238fc55ae65140903d69 | |
| parent | 4c5e9d004c3233d73d75cc23170d0886dc1c2858 (diff) | |
| download | platform_external_libvpx-lollipop-mr1-wfc-release.tar.gz platform_external_libvpx-lollipop-mr1-wfc-release.tar.bz2 platform_external_libvpx-lollipop-mr1-wfc-release.zip | |
Try to CP ag/749963 from klp-dev into lmp-mr1-releaseandroid-5.1.1_r28android-5.1.1_r22lollipop-mr1-wfc-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 17c08b64..d1741c50 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 130d9653..9bf1556d 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; # |