summaryrefslogtreecommitdiff
path: root/vp8/decoder/decodframe.c
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2011-04-22 00:05:08 -0400
committerJohn Koleszar <jkoleszar@google.com>2011-04-22 00:05:08 -0400
commit5dfd6f51cbdbfb6d37e3ec8f67f1d0ffc246e0ab (patch)
tree2761299d30474aafdad2913415030a2ac878d73e /vp8/decoder/decodframe.c
parentb59bd22cc0f89bc13c0b53b1ef618cc405e5dd1f (diff)
parent73c3d327058b1850da4fbfc9819d1265be70965a (diff)
downloadlibvpx-5dfd6f51cbdbfb6d37e3ec8f67f1d0ffc246e0ab.tar
libvpx-5dfd6f51cbdbfb6d37e3ec8f67f1d0ffc246e0ab.tar.gz
libvpx-5dfd6f51cbdbfb6d37e3ec8f67f1d0ffc246e0ab.tar.bz2
libvpx-5dfd6f51cbdbfb6d37e3ec8f67f1d0ffc246e0ab.zip
Merge remote branch 'origin/master' into experimental
Change-Id: I6f77e7c10a54c54b26126b8acd5edd0a03358a41
Diffstat (limited to 'vp8/decoder/decodframe.c')
-rw-r--r--vp8/decoder/decodframe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c
index 82841e8b8..c1faaf10a 100644
--- a/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@ -120,7 +120,7 @@ static void skip_recon_mb(VP8D_COMP *pbi, MACROBLOCKD *xd)
}
else
{
- vp8_build_inter_predictors_mb_s(xd);
+ vp8_build_inter16x16_predictors_mb_s(xd);
}
}