summaryrefslogtreecommitdiff
path: root/vp9/decoder
diff options
context:
space:
mode:
authorDmitry Kovalev <dkovalev@google.com>2013-07-20 22:40:51 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2013-07-20 22:40:51 -0700
commit39342db13897120aeace93f19fb83a2551419a4f (patch)
tree79b089b6fee0d9bad4bcde930c52d59e51b96b73 /vp9/decoder
parentf66821afbbec498f6fc7186a4603a7540f7ee7a7 (diff)
parentbc7acb134b40d0358f4035854384614d3368489c (diff)
downloadlibvpx-39342db13897120aeace93f19fb83a2551419a4f.tar
libvpx-39342db13897120aeace93f19fb83a2551419a4f.tar.gz
libvpx-39342db13897120aeace93f19fb83a2551419a4f.tar.bz2
libvpx-39342db13897120aeace93f19fb83a2551419a4f.zip
Merge "Consistent names for inter mode probabilities and encodings."
Diffstat (limited to 'vp9/decoder')
-rw-r--r--vp9/decoder/vp9_decodemv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c
index aaef9d66a..6660f5b8e 100644
--- a/vp9/decoder/vp9_decodemv.c
+++ b/vp9/decoder/vp9_decodemv.c
@@ -31,7 +31,7 @@ static MB_PREDICTION_MODE read_intra_mode(vp9_reader *r, const vp9_prob *p) {
}
static MB_PREDICTION_MODE read_inter_mode(vp9_reader *r, const vp9_prob *p) {
- return (MB_PREDICTION_MODE)treed_read(r, vp9_sb_mv_ref_tree, p);
+ return (MB_PREDICTION_MODE)treed_read(r, vp9_inter_mode_tree, p);
}
static int read_segment_id(vp9_reader *r, const struct segmentation *seg) {