summaryrefslogtreecommitdiff
path: root/vp8/encoder/bitstream.c
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2011-05-27 00:05:12 -0400
committerJohn Koleszar <jkoleszar@google.com>2011-05-27 00:05:12 -0400
commit2fa7fe66c41b85b71d74d14a64bf731673f8bc10 (patch)
tree7dfc7af9ab905e8756fad5cb1e97a658bf4343fe /vp8/encoder/bitstream.c
parent26fd970b154f77fcc8eabbcf035c18558bb191cb (diff)
parent1fe5070b7698957930864502adce0d3c9cceae8d (diff)
downloadlibvpx-2fa7fe66c41b85b71d74d14a64bf731673f8bc10.tar
libvpx-2fa7fe66c41b85b71d74d14a64bf731673f8bc10.tar.gz
libvpx-2fa7fe66c41b85b71d74d14a64bf731673f8bc10.tar.bz2
libvpx-2fa7fe66c41b85b71d74d14a64bf731673f8bc10.zip
Merge remote branch 'origin/master' into experimental
Change-Id: I6d6692418eecf54e23e00a08394b0b37d6e7682b
Diffstat (limited to 'vp8/encoder/bitstream.c')
-rw-r--r--vp8/encoder/bitstream.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c
index ec2bb94a7..b10f8c01f 100644
--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@ -1020,7 +1020,7 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi)
assert(0);
leftmv.as_int = left_block_mv(m, k);
abovemv.as_int = above_block_mv(m, k, mis);
- mv_contz = vp8_mv_cont(&(leftmv.as_mv), &(abovemv.as_mv));
+ mv_contz = vp8_mv_cont(&leftmv, &abovemv);
write_sub_mv_ref(w, b->mode, vp8_sub_mv_ref_prob2 [mv_contz]); //pc->fc.sub_mv_ref_prob);