Rough merge of master into experimental

[platform/upstream/libvpx.git] / vp9 / encoder / x86 / quantize_ssse3.asm

diff --git a/vp9/encoder/x86/quantize_ssse3.asm b/vp9/encoder/x86/quantize_ssse3.asm
index 14a9912..8c46428 100644 (file)
--- a/vp9/encoder/x86/quantize_ssse3.asm
+++ b/vp9/encoder/x86/quantize_ssse3.asm
@@ -9,7 +9,7 @@
 
 
 %include "vpx_ports/x86_abi_support.asm"
-%include "asm_enc_offsets.asm"
+%include "vp9_asm_enc_offsets.asm"
 
 
 ; void vp9_fast_quantize_b_ssse3 | arg