diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-03-05 11:17:14 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-03-05 11:17:14 -0800 |
| commit | 4209bba4627bb148fce5b8b6caa4de5ac526fa92 (patch) | |
| tree | 7f6331977912073a0c30b5859d87afaf3fd4ec41 /vp9/encoder/vp9_onyx_int.h | |
| parent | 764be4f66fc3928ec668f8faccef1705049ff5a5 (diff) | |
| parent | 97dd7342b8591627b7dd07cb79f91b544213caa9 (diff) | |
| download | libvpx-4209bba4627bb148fce5b8b6caa4de5ac526fa92.tar libvpx-4209bba4627bb148fce5b8b6caa4de5ac526fa92.tar.gz libvpx-4209bba4627bb148fce5b8b6caa4de5ac526fa92.tar.bz2 libvpx-4209bba4627bb148fce5b8b6caa4de5ac526fa92.zip | |
Merge changes Ifacbf5a0,Ibad7c3dd into experimental
* changes:
vpxenc: actually report mismatch on stderr.
Make superblocks independent of macroblock code and data.
Diffstat (limited to 'vp9/encoder/vp9_onyx_int.h')
| -rw-r--r-- | vp9/encoder/vp9_onyx_int.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index 0bc7bc835..3dc4772ef 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -92,7 +92,7 @@ typedef struct { vp9_coeff_probs coef_probs_4x4[BLOCK_TYPES]; vp9_coeff_probs coef_probs_8x8[BLOCK_TYPES]; vp9_coeff_probs coef_probs_16x16[BLOCK_TYPES]; - vp9_coeff_probs coef_probs_32x32[BLOCK_TYPES_32X32]; + vp9_coeff_probs coef_probs_32x32[BLOCK_TYPES]; vp9_prob sb_ymode_prob[VP9_I32X32_MODES - 1]; vp9_prob ymode_prob[VP9_YMODES - 1]; /* interframe intra mode probs */ @@ -476,9 +476,9 @@ typedef struct VP9_COMP { vp9_coeff_probs frame_coef_probs_16x16[BLOCK_TYPES]; vp9_coeff_stats frame_branch_ct_16x16[BLOCK_TYPES]; - vp9_coeff_count coef_counts_32x32[BLOCK_TYPES_32X32]; - vp9_coeff_probs frame_coef_probs_32x32[BLOCK_TYPES_32X32]; - vp9_coeff_stats frame_branch_ct_32x32[BLOCK_TYPES_32X32]; + vp9_coeff_count coef_counts_32x32[BLOCK_TYPES]; + vp9_coeff_probs frame_coef_probs_32x32[BLOCK_TYPES]; + vp9_coeff_stats frame_branch_ct_32x32[BLOCK_TYPES]; int gfu_boost; int last_boost; |