summaryrefslogtreecommitdiff
path: root/vp8/decoder/arm/detokenize.asm
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2011-02-09 00:05:12 -0500
committerJohn Koleszar <jkoleszar@google.com>2011-02-09 00:05:12 -0500
commit6e6b46d97295c8227717e294f07de7283303369a (patch)
treeb3b893730eebd1f05fc89b09fd85454987176aed /vp8/decoder/arm/detokenize.asm
parent9683198e7b97b3e1f5b56bdc2d66a1b1e17a1209 (diff)
parentcc17629f30dce0096a2674716008ab5c57080874 (diff)
downloadlibvpx-6e6b46d97295c8227717e294f07de7283303369a.tar
libvpx-6e6b46d97295c8227717e294f07de7283303369a.tar.gz
libvpx-6e6b46d97295c8227717e294f07de7283303369a.tar.bz2
libvpx-6e6b46d97295c8227717e294f07de7283303369a.zip
Merge remote branch 'origin/master' into experimental
Change-Id: Ibc762883a5e117f5db64dc01a46a9c78438e6c33
Diffstat (limited to 'vp8/decoder/arm/detokenize.asm')
-rw-r--r--vp8/decoder/arm/detokenize.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/decoder/arm/detokenize.asm b/vp8/decoder/arm/detokenize.asm
index 45e068a9f..0c164f191 100644
--- a/vp8/decoder/arm/detokenize.asm
+++ b/vp8/decoder/arm/detokenize.asm
@@ -13,7 +13,7 @@
AREA |.text|, CODE, READONLY ; name this block of code
- INCLUDE vpx_asm_offsets.asm
+ INCLUDE asm_dec_offsets.asm
l_qcoeff EQU 0
l_i EQU 4