summaryrefslogtreecommitdiff
path: root/vp8/common
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2011-04-05 00:05:10 -0400
committerJohn Koleszar <jkoleszar@google.com>2011-04-05 00:05:10 -0400
commita6be45c9ca1e4c570998852a84085e2eec0b319a (patch)
tree392bacb3ebd4c1bb261e4851a91a6353b6cecd91 /vp8/common
parent2588b8fe052e0b4bbc59eca4016f4b732a4d3a6e (diff)
parent91036996ac3871dccf4c6cfe47504c7b99f8555c (diff)
downloadlibvpx-a6be45c9ca1e4c570998852a84085e2eec0b319a.tar
libvpx-a6be45c9ca1e4c570998852a84085e2eec0b319a.tar.gz
libvpx-a6be45c9ca1e4c570998852a84085e2eec0b319a.tar.bz2
libvpx-a6be45c9ca1e4c570998852a84085e2eec0b319a.zip
Merge remote branch 'origin/master' into experimental
Change-Id: I53be500dad1a98e21d0a28f9e07761d8d03fdcf6
Diffstat (limited to 'vp8/common')
-rw-r--r--vp8/common/entropymv.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/vp8/common/entropymv.h b/vp8/common/entropymv.h
index 911507ddc..2db1e385b 100644
--- a/vp8/common/entropymv.h
+++ b/vp8/common/entropymv.h
@@ -18,6 +18,8 @@ enum
{
mv_max = 1023, /* max absolute value of a MV component */
MVvals = (2 * mv_max) + 1, /* # possible values "" */
+ mvfp_max = 255, /* max absolute value of a full pixel MV component */
+ MVfpvals = (2 * mvfp_max) +1, /* # possible full pixel MV values */
mvlong_width = 10, /* Large MVs have 9 bit magnitudes */
mvnum_short = 8, /* magnitudes 0 through 7 */