diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-05-30 20:58:19 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-30 20:58:19 -0700 |
| commit | 310bc1030afa740dd1196a995b7031d172ce13bd (patch) | |
| tree | 4f16edf334c994576e4349d17b4b5bede54359ae /vp9/decoder | |
| parent | 7d549870f7c2390d57af98d5bd6d4b0e2e32793b (diff) | |
| parent | a433abbcad40ea2498bc3418f2ee8090e1b42ffb (diff) | |
| download | libvpx-310bc1030afa740dd1196a995b7031d172ce13bd.tar libvpx-310bc1030afa740dd1196a995b7031d172ce13bd.tar.gz libvpx-310bc1030afa740dd1196a995b7031d172ce13bd.tar.bz2 libvpx-310bc1030afa740dd1196a995b7031d172ce13bd.zip | |
Merge "Merge VP9_YMODES, VP9_UV_MODES, INTRA_MODE_COUNT and cousins." into experimental
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodemv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index 91a8769a0..8843c6b97 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -384,9 +384,9 @@ static void mb_mode_mv_init(VP9D_COMP *pbi, vp9_reader *r) { for (i = 0; i < COMP_PRED_CONTEXTS; i++) cm->prob_comppred[i] = vp9_read_prob(r); - // VP9_YMODES + // VP9_INTRA_MODES if (vp9_read_bit(r)) - for (i = 0; i < VP9_YMODES - 1; ++i) + for (i = 0; i < VP9_INTRA_MODES - 1; ++i) cm->fc.y_mode_prob[i] = vp9_read_prob(r); for (j = 0; j < NUM_PARTITION_CONTEXTS; ++j) |