diff options
| author | Johann Koenig <johannkoenig@google.com> | 2016-02-04 21:11:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-02-04 21:11:38 +0000 |
| commit | cd144c49d99e7db418caca49e3aa8a07085fb845 (patch) | |
| tree | 9bd22208a69f2eb69c443d1d4f13c9600fe75c69 | |
| parent | b31204f16bce4fe40aea1da3a1ab8ebd1f95bc14 (diff) | |
| parent | 8f0c757aabc87185f6d39d514906dd020607296b (diff) | |
| download | libvpx-cd144c49d99e7db418caca49e3aa8a07085fb845.tar.gz | |
Merge "Cherry pick vp8 quantizer fix"
| -rw-r--r-- | libvpx/vp8/decoder/decodeframe.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libvpx/vp8/decoder/decodeframe.c b/libvpx/vp8/decoder/decodeframe.c index f0d760373..4bc87eb13 100644 --- a/libvpx/vp8/decoder/decodeframe.c +++ b/libvpx/vp8/decoder/decodeframe.c @@ -73,10 +73,9 @@ void vp8_mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd) /* Delta Value */ else - { QIndex = pc->base_qindex + xd->segment_feature_data[MB_LVL_ALT_Q][mbmi->segment_id]; - QIndex = (QIndex >= 0) ? ((QIndex <= MAXQ) ? QIndex : MAXQ) : 0; /* Clamp to valid range */ - } + + QIndex = (QIndex >= 0) ? ((QIndex <= MAXQ) ? QIndex : MAXQ) : 0; /* Clamp to valid range */ } else QIndex = pc->base_qindex; |