Rough merge of master into experimental

[platform/upstream/libvpx.git] / vp9 / encoder / arm / armv6 / vp8_subtract_armv6.asm

diff --git a/vp9/encoder/arm/armv6/vp8_subtract_armv6.asm b/vp9/encoder/arm/armv6/vp8_subtract_armv6.asm
index 0ca7438..bb466c4 100644 (file)
--- a/vp9/encoder/arm/armv6/vp8_subtract_armv6.asm
+++ b/vp9/encoder/arm/armv6/vp8_subtract_armv6.asm
@@ -13,7 +13,7 @@
     EXPORT  |vp8_subtract_mbuv_armv6|
     EXPORT  |vp8_subtract_b_armv6|
 
-    INCLUDE asm_enc_offsets.asm
+    INCLUDE vp9_asm_enc_offsets.asm
 
     ARM
     REQUIRE8