diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2012-10-22 12:54:39 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-10-22 12:54:39 -0700 |
| commit | 97096f5fa355a27cd7262bf05f05156e40090c03 (patch) | |
| tree | e5f5365e651ea95c64d13255fac114892e904985 /vp8/decoder/detokenize.c | |
| parent | 7906ed091ab5d16a7fbdc21109a034644aa6b9a3 (diff) | |
| parent | f72fdf1c7f443b8b62559279e55b439b0814e58a (diff) | |
| download | libvpx-97096f5fa355a27cd7262bf05f05156e40090c03.tar libvpx-97096f5fa355a27cd7262bf05f05156e40090c03.tar.gz libvpx-97096f5fa355a27cd7262bf05f05156e40090c03.tar.bz2 libvpx-97096f5fa355a27cd7262bf05f05156e40090c03.zip | |
Merge changes I02e7f64a,Ide954b00,Idc8b5977 into experimental
* changes:
Fix another typo in 4x4-transform-for-i8x8-intra-pred coeff contexts.
8x8 transform support in splitmv.
Use SPLITMV_PARTITIONING instead of a plain integer type.
Diffstat (limited to 'vp8/decoder/detokenize.c')
| -rw-r--r-- | vp8/decoder/detokenize.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp8/decoder/detokenize.c b/vp8/decoder/detokenize.c index 0e5e54418..d33c602f0 100644 --- a/vp8/decoder/detokenize.c +++ b/vp8/decoder/detokenize.c @@ -493,7 +493,8 @@ int vp8_decode_mb_tokens_8x8(VP8D_COMP *pbi, MACROBLOCKD *xd, INT16 *qcoeff_ptr = &xd->qcoeff[0]; TX_TYPE tx_type = DCT_DCT; - int bufthred = (xd->mode_info_context->mbmi.mode == I8X8_PRED) ? 16 : 24; + int bufthred = (xd->mode_info_context->mbmi.mode == I8X8_PRED || + xd->mode_info_context->mbmi.mode == SPLITMV) ? 16 : 24; if (xd->mode_info_context->mbmi.mode != B_PRED && xd->mode_info_context->mbmi.mode != SPLITMV && xd->mode_info_context->mbmi.mode != I8X8_PRED) { |