Rough merge of master into experimental

[platform/upstream/libvpx.git] / vp9 / encoder / arm / neon / fastquantizeb_neon.asm

diff --git a/vp9/encoder/arm/neon/fastquantizeb_neon.asm b/vp9/encoder/arm/neon/fastquantizeb_neon.asm
index 2597076..fa3aff8 100644 (file)
--- a/vp9/encoder/arm/neon/fastquantizeb_neon.asm
+++ b/vp9/encoder/arm/neon/fastquantizeb_neon.asm
@@ -12,7 +12,7 @@
     EXPORT  |vp8_fast_quantize_b_neon|
     EXPORT  |vp8_fast_quantize_b_pair_neon|
 
-    INCLUDE asm_enc_offsets.asm
+    INCLUDE vp9_asm_enc_offsets.asm
 
     ARM
     REQUIRE8