Rough merge of master into experimental

[platform/upstream/libvpx.git] / vp9 / encoder / arm / armv5te / vp8_packtokens_mbrow_armv5.asm

diff --git a/vp9/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.asm b/vp9/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.asm
index a1c647d..0938ce1 100644 (file)
--- a/vp9/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.asm
+++ b/vp9/encoder/arm/armv5te/vp8_packtokens_mbrow_armv5.asm
@@ -11,7 +11,7 @@
 
     EXPORT |vp8cx_pack_mb_row_tokens_armv5|
 
-    INCLUDE asm_enc_offsets.asm
+    INCLUDE vp9_asm_enc_offsets.asm
 
     ARM
     REQUIRE8