summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohann <johannkoenig@google.com>2013-10-04 11:08:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-04 11:08:50 -0700
commit71212ed7a3f067d8052e737452ebe4dec2460ba1 (patch)
tree63828ad2107f2c97fcb0598127f0fb71d1eb2c9c
parent26a9ff1209d58df59f64a16cffb168510dc027c2 (diff)
parente6eeaaa14ccef4c0938fcce21c54979204041a30 (diff)
downloadandroid_external_libvpx-71212ed7a3f067d8052e737452ebe4dec2460ba1.tar.gz
android_external_libvpx-71212ed7a3f067d8052e737452ebe4dec2460ba1.tar.bz2
android_external_libvpx-71212ed7a3f067d8052e737452ebe4dec2460ba1.zip
am e6eeaaa1: Support bilinear filter in VP9
* commit 'e6eeaaa14ccef4c0938fcce21c54979204041a30': Support bilinear filter in VP9
-rw-r--r--libvpx/vp9/decoder/vp9_decodframe.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libvpx/vp9/decoder/vp9_decodframe.c b/libvpx/vp9/decoder/vp9_decodframe.c
index 34ed0c7..dbba28e 100644
--- a/libvpx/vp9/decoder/vp9_decodframe.c
+++ b/libvpx/vp9/decoder/vp9_decodframe.c
@@ -492,7 +492,8 @@ static INTERPOLATIONFILTERTYPE read_interp_filter_type(
struct vp9_read_bit_buffer *rb) {
const INTERPOLATIONFILTERTYPE literal_to_type[] = { EIGHTTAP_SMOOTH,
EIGHTTAP,
- EIGHTTAP_SHARP };
+ EIGHTTAP_SHARP,
+ BILINEAR };
return vp9_rb_read_bit(rb) ? SWITCHABLE
: literal_to_type[vp9_rb_read_literal(rb, 2)];
}