diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-09-04 14:21:30 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-09-04 14:21:30 -0700 |
| commit | 72872d3d8c2a5bc54bea585552f3ea47e82770c5 (patch) | |
| tree | ef4355665bb1be02996790dbfce940b565c58794 /vp9/decoder/vp9_decodframe.c | |
| parent | 3c05bda058f3aecb6dc08cba0f59b261866d47d8 (diff) | |
| parent | 890eee3b47f6a54a6c2f571f04ff8eae337e922a (diff) | |
| download | libvpx-72872d3d8c2a5bc54bea585552f3ea47e82770c5.tar libvpx-72872d3d8c2a5bc54bea585552f3ea47e82770c5.tar.gz libvpx-72872d3d8c2a5bc54bea585552f3ea47e82770c5.tar.bz2 libvpx-72872d3d8c2a5bc54bea585552f3ea47e82770c5.zip | |
Merge "Fixing problem with invalid delta_q reading."
Diffstat (limited to 'vp9/decoder/vp9_decodframe.c')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index e41ea541d..6cb7c094b 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -454,8 +454,7 @@ static void setup_loopfilter(struct loopfilter *lf, static int read_delta_q(struct vp9_read_bit_buffer *rb, int *delta_q) { const int old = *delta_q; - if (vp9_rb_read_bit(rb)) - *delta_q = vp9_rb_read_signed_literal(rb, 4); + *delta_q = vp9_rb_read_bit(rb) ? vp9_rb_read_signed_literal(rb, 4) : 0; return old != *delta_q; } |