comparison ac3dec.c @ 6116:4f8fcb40bf2c libavcodec

remove unneeded variables from AC3HeaderInfo

6115:98be2e14e5d6

        return err;

    /* get decoding parameters from header info */
    s->bit_alloc_params.sr_code     = hdr.sr_code;
    s->channel_mode                 = hdr.channel_mode;
    center_mix_level                = gain_levels[center_levels[hdr.center_mix_level]];
    surround_mix_level              = gain_levels[surround_levels[hdr.surround_mix_level]];
    s->lfe_on                       = hdr.lfe_on;
    s->bit_alloc_params.sr_shift    = hdr.sr_shift;
    s->sample_rate                  = hdr.sample_rate;
    s->bit_rate                     = hdr.bit_rate;
    s->channels                     = hdr.channels;

    skip_bits(gbc, 11); // skip bsid, bsmod, and acmod
    if(s->channel_mode == AC3_CHMODE_STEREO) {
        skip_bits(gbc, 2); // skip dsurmod
    } else {
        if((s->channel_mode & 1) && s->channel_mode != AC3_CHMODE_MONO)
            skip_bits(gbc, 2); // skip cmixlev
        if(s->channel_mode & 4)
            skip_bits(gbc, 2); // skip surmixlev
    }
    skip_bits1(gbc); // skip lfeon

    /* read the rest of the bsi. read twice for dual mono mode. */
    i = !(s->channel_mode);

6116:4f8fcb40bf2c

        return err;

    /* get decoding parameters from header info */
    s->bit_alloc_params.sr_code     = hdr.sr_code;
    s->channel_mode                 = hdr.channel_mode;
    s->lfe_on                       = hdr.lfe_on;
    s->bit_alloc_params.sr_shift    = hdr.sr_shift;
    s->sample_rate                  = hdr.sample_rate;
    s->bit_rate                     = hdr.bit_rate;
    s->channels                     = hdr.channels;

    skip_bits(gbc, 11); // skip bsid, bsmod, and acmod
    if(s->channel_mode == AC3_CHMODE_STEREO) {
        skip_bits(gbc, 2); // skip dsurmod
    } else {
        if((s->channel_mode & 1) && s->channel_mode != AC3_CHMODE_MONO)
            center_mix_level = gain_levels[center_levels[get_bits(gbc, 2)]];
        if(s->channel_mode & 4)
            surround_mix_level = gain_levels[surround_levels[get_bits(gbc, 2)]];
    }
    skip_bits1(gbc); // skip lfeon

    /* read the rest of the bsi. read twice for dual mono mode. */
    i = !(s->channel_mode);