Revision 866181e5

View differences:

libavcodec/ac3dec.c
145 145
    uint8_t dba_lengths[AC3_MAX_CHANNELS][8]; ///< delta segment lengths
146 146
    uint8_t dba_values[AC3_MAX_CHANNELS][8];  ///< delta values for each segment
147 147

  
148
    int sampling_rate;                      ///< sample frequency, in Hz
148
    int sample_rate;                        ///< sample frequency, in Hz
149 149
    int bit_rate;                           ///< stream bit rate, in bits-per-second
150 150
    int frame_size;                         ///< current frame size, in bytes
151 151

  
......
337 337
    surround_mix_level              = gain_levels[surround_levels[hdr.surround_mix_level]];
338 338
    s->lfe_on                       = hdr.lfe_on;
339 339
    s->bit_alloc_params.sr_shift    = hdr.sr_shift;
340
    s->sampling_rate                = hdr.sample_rate;
340
    s->sample_rate                  = hdr.sample_rate;
341 341
    s->bit_rate                     = hdr.bit_rate;
342 342
    s->channels                     = hdr.channels;
343 343
    s->fbw_channels                 = s->channels - s->lfe_on;
......
1103 1103
        return -1;
1104 1104
    }
1105 1105

  
1106
    avctx->sample_rate = s->sampling_rate;
1106
    avctx->sample_rate = s->sample_rate;
1107 1107
    avctx->bit_rate = s->bit_rate;
1108 1108

  
1109 1109
    /* check that reported frame size fits in input buffer */

Also available in: Unified diff