diff options
| author | Martin Storsjo <martin@martin.st> | 2015-06-13 00:35:01 +0300 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2015-06-25 08:25:58 -0700 |
| commit | 086dd8ea90eaf4ead8b4927e777b1c8a19bd23a9 (patch) | |
| tree | 06f96f8afacd74f18093767da8e7e8ea5bf0ce00 /decoder/ih264d_parse_islice.c | |
| parent | 4adb9f492336cd3f6204201eac52b29166179cb4 (diff) | |
| download | android_external_libavc-086dd8ea90eaf4ead8b4927e777b1c8a19bd23a9.tar.gz android_external_libavc-086dd8ea90eaf4ead8b4927e777b1c8a19bd23a9.tar.bz2 android_external_libavc-086dd8ea90eaf4ead8b4927e777b1c8a19bd23a9.zip | |
Don't declare variables after statements
This fixes building with compilers that are strict about the pre-C99
rule about having all variable declarations before statements.
Change-Id: I06dd0cc42a6dbe90025c3c913a0c8d9ffb0acbcb
Diffstat (limited to 'decoder/ih264d_parse_islice.c')
| -rw-r--r-- | decoder/ih264d_parse_islice.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/decoder/ih264d_parse_islice.c b/decoder/ih264d_parse_islice.c index 534c785..1e4fdfa 100644 --- a/decoder/ih264d_parse_islice.c +++ b/decoder/ih264d_parse_islice.c @@ -132,21 +132,23 @@ WORD32 ih264d_parse_imb_cavlc(dec_struct_t * ps_dec, /*--------------------------------------------------------------------*/ if (!ps_cur_mb_info->u1_tran_form8x8) { + UWORD8 *pu1_temp; ih264d_read_intra_pred_modes(ps_dec, ((UWORD8 *)ps_dec->pv_parse_tu_coeff_data), ((UWORD8 *)ps_dec->pv_parse_tu_coeff_data+16), ps_cur_mb_info->u1_tran_form8x8); - UWORD8 *pu1_temp = (UWORD8 *)ps_dec->pv_parse_tu_coeff_data; + pu1_temp = (UWORD8 *)ps_dec->pv_parse_tu_coeff_data; pu1_temp += 32; ps_dec->pv_parse_tu_coeff_data = (void *)pu1_temp; } else { + UWORD8 *pu1_temp; ih264d_read_intra_pred_modes(ps_dec, ((UWORD8 *)ps_dec->pv_parse_tu_coeff_data), ((UWORD8 *)ps_dec->pv_parse_tu_coeff_data+4), ps_cur_mb_info->u1_tran_form8x8); - UWORD8 *pu1_temp = (UWORD8 *)ps_dec->pv_parse_tu_coeff_data; + pu1_temp = (UWORD8 *)ps_dec->pv_parse_tu_coeff_data; pu1_temp += 8; ps_dec->pv_parse_tu_coeff_data = (void *)pu1_temp; } @@ -403,8 +405,8 @@ WORD32 ih264d_parse_imb_cavlc(dec_struct_t * ps_dec, (tu_sblk4x4_coeff_data_t *)ps_dec->pv_parse_tu_coeff_data; WORD16 *pi2_coeff_block = (WORD16 *)ps_dec->pv_parse_tu_coeff_data; - ps_tu_4x4->u2_sig_coeff_map = 0; UWORD32 u4_num_coeff; + ps_tu_4x4->u2_sig_coeff_map = 0; ret = ps_dec->pf_cavlc_parse4x4coeff[(ui_N > 7)](pi2_dc_coef, 0, ui_N, ps_dec, &u4_num_coeff); @@ -542,23 +544,25 @@ WORD32 ih264d_parse_imb_cabac(dec_struct_t * ps_dec, /*--------------------------------------------------------------------*/ if (!ps_cur_mb_info->u1_tran_form8x8) { + UWORD8 *pu1_temp; ih264d_read_intra_pred_modes_cabac( ps_dec, ((UWORD8 *)ps_dec->pv_parse_tu_coeff_data), ((UWORD8 *)ps_dec->pv_parse_tu_coeff_data+16), ps_cur_mb_info->u1_tran_form8x8); - UWORD8 *pu1_temp = (UWORD8 *)ps_dec->pv_parse_tu_coeff_data; + pu1_temp = (UWORD8 *)ps_dec->pv_parse_tu_coeff_data; pu1_temp += 32; ps_dec->pv_parse_tu_coeff_data = (void *)pu1_temp; } else { + UWORD8 *pu1_temp; ih264d_read_intra_pred_modes_cabac( ps_dec, ((UWORD8 *)ps_dec->pv_parse_tu_coeff_data), ((UWORD8 *)ps_dec->pv_parse_tu_coeff_data+4), ps_cur_mb_info->u1_tran_form8x8); - UWORD8 *pu1_temp = (UWORD8 *)ps_dec->pv_parse_tu_coeff_data; + pu1_temp = (UWORD8 *)ps_dec->pv_parse_tu_coeff_data; pu1_temp += 8; ps_dec->pv_parse_tu_coeff_data = (void *)pu1_temp; } |