comparison aac.c @ 7637:1fd8e319e8b6 libavcodec

Work around GCC variable may be used uninitialised warning

7636:2774adcaf040

        GetBitContext * gb, const IndividualChannelStream * ics) {
    int w, filt, i, coef_len, coef_res, coef_compress;
    const int is8 = ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE;
    const int tns_max_order = is8 ? 7 : ac->m4ac.object_type == AOT_AAC_MAIN ? 20 : 12;
    for (w = 0; w < ics->num_windows; w++) {
        tns->n_filt[w] = get_bits(gb, 2 - is8);

        if (tns->n_filt[w])
            coef_res = get_bits1(gb);

        for (filt = 0; filt < tns->n_filt[w]; filt++) {
            int tmp2_idx;
            tns->length[w][filt] = get_bits(gb, 6 - 2*is8);

            coef_len = coef_res + 3 - coef_compress;
            tmp2_idx = 2*coef_compress + coef_res;

            for (i = 0; i < tns->order[w][filt]; i++)
                tns->coef[w][filt][i] = tns_tmp2_map[tmp2_idx][get_bits(gb, coef_len)];
        }
    }
    return 0;
}

7637:1fd8e319e8b6

        GetBitContext * gb, const IndividualChannelStream * ics) {
    int w, filt, i, coef_len, coef_res, coef_compress;
    const int is8 = ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE;
    const int tns_max_order = is8 ? 7 : ac->m4ac.object_type == AOT_AAC_MAIN ? 20 : 12;
    for (w = 0; w < ics->num_windows; w++) {
        if ((tns->n_filt[w] = get_bits(gb, 2 - is8))) {
            coef_res = get_bits1(gb);

        for (filt = 0; filt < tns->n_filt[w]; filt++) {
            int tmp2_idx;
            tns->length[w][filt] = get_bits(gb, 6 - 2*is8);

            coef_len = coef_res + 3 - coef_compress;
            tmp2_idx = 2*coef_compress + coef_res;

            for (i = 0; i < tns->order[w][filt]; i++)
                tns->coef[w][filt][i] = tns_tmp2_map[tmp2_idx][get_bits(gb, coef_len)];
        }
        }
    }
    return 0;
}