diff options
| author | pascal massimino <pascal.massimino@gmail.com> | 2012-10-17 15:17:21 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-10-17 15:17:21 -0700 |
| commit | 07c03b3f235ca17a1cbe47507bec8bf7bef02e90 (patch) | |
| tree | 465122eca8a51aeeb694ad8b7277170b87ca3b93 /vp8/decoder/decodframe.c | |
| parent | e17bb9e39b089b13055614a5dd8f6f41b42bd76d (diff) | |
| parent | 3883dab0a2dedbcf636e91064c38040af744bc90 (diff) | |
| download | libvpx-07c03b3f235ca17a1cbe47507bec8bf7bef02e90.tar libvpx-07c03b3f235ca17a1cbe47507bec8bf7bef02e90.tar.gz libvpx-07c03b3f235ca17a1cbe47507bec8bf7bef02e90.tar.bz2 libvpx-07c03b3f235ca17a1cbe47507bec8bf7bef02e90.zip | |
Merge "cosmetic: fix '= & ' construct" into experimental
Diffstat (limited to 'vp8/decoder/decodframe.c')
| -rw-r--r-- | vp8/decoder/decodframe.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index a46b0de34..30878cfdf 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -77,7 +77,7 @@ static vp8_prob read_prob_diff_update(vp8_reader *const bc, int oldp) { void vp8cx_init_de_quantizer(VP8D_COMP *pbi) { int i; int Q; - VP8_COMMON *const pc = & pbi->common; + VP8_COMMON *const pc = &pbi->common; for (Q = 0; Q < QINDEX_RANGE; Q++) { pc->Y1dequant[Q][0] = (short)vp8_dc_quant(Q, pc->y1dc_delta_q); @@ -98,7 +98,7 @@ void vp8cx_init_de_quantizer(VP8D_COMP *pbi) { void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd) { int i; int QIndex; - VP8_COMMON *const pc = & pbi->common; + VP8_COMMON *const pc = &pbi->common; int segment_id = xd->mode_info_context->mbmi.segment_id; // Set the Q baseline allowing for any segment level adjustment @@ -807,8 +807,8 @@ static void setup_token_decoder(VP8D_COMP *pbi, } static void init_frame(VP8D_COMP *pbi) { - VP8_COMMON *const pc = & pbi->common; - MACROBLOCKD *const xd = & pbi->mb; + VP8_COMMON *const pc = &pbi->common; + MACROBLOCKD *const xd = &pbi->mb; if (pc->frame_type == KEY_FRAME) { /* Various keyframe initializations */ @@ -885,8 +885,8 @@ static void init_frame(VP8D_COMP *pbi) { static void read_coef_probs2(VP8D_COMP *pbi) { const vp8_prob grpupd = 192; int i, j, k, l; - vp8_reader *const bc = & pbi->bc; - VP8_COMMON *const pc = & pbi->common; + vp8_reader *const bc = &pbi->bc; + VP8_COMMON *const pc = &pbi->common; for (l = 0; l < ENTROPY_NODES; l++) { if (vp8_read(bc, grpupd)) { // printf("Decoding %d\n", l); @@ -928,8 +928,8 @@ static void read_coef_probs2(VP8D_COMP *pbi) { static void read_coef_probs(VP8D_COMP *pbi) { int i, j, k, l; - vp8_reader *const bc = & pbi->bc; - VP8_COMMON *const pc = & pbi->common; + vp8_reader *const bc = &pbi->bc; + VP8_COMMON *const pc = &pbi->common; { if (vp8_read_bit(bc)) { @@ -1053,9 +1053,9 @@ static void read_coef_probs(VP8D_COMP *pbi) { } int vp8_decode_frame(VP8D_COMP *pbi) { - vp8_reader *const bc = & pbi->bc; - VP8_COMMON *const pc = & pbi->common; - MACROBLOCKD *const xd = & pbi->mb; + vp8_reader *const bc = &pbi->bc; + VP8_COMMON *const pc = &pbi->common; + MACROBLOCKD *const xd = &pbi->mb; const unsigned char *data = (const unsigned char *)pbi->Source; const unsigned char *data_end = data + pbi->source_sz; ptrdiff_t first_partition_length_in_bytes = 0; |