diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2007-12-30 21:26:30 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2007-12-30 21:26:30 +0000 |
| commit | 866181e5e83ec0d55acbd8ab6e3eaa14c0ca93b3 (patch) | |
| tree | 249b58f16881c5609a89923a061d555726e9d80d | |
| parent | 0345fade94e74bc7fc7709d3e7c6a261f853d8ae (diff) | |
| download | ffmpeg-866181e5e83ec0d55acbd8ab6e3eaa14c0ca93b3.tar.gz | |
cosmetics: rename sampling_rate to sample_rate
Originally committed as revision 11358 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/ac3dec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index deee7d5d9a..bf17ac8f20 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -145,7 +145,7 @@ typedef struct { uint8_t dba_lengths[AC3_MAX_CHANNELS][8]; ///< delta segment lengths uint8_t dba_values[AC3_MAX_CHANNELS][8]; ///< delta values for each segment - int sampling_rate; ///< sample frequency, in Hz + int sample_rate; ///< sample frequency, in Hz int bit_rate; ///< stream bit rate, in bits-per-second int frame_size; ///< current frame size, in bytes @@ -337,7 +337,7 @@ static int ac3_parse_header(AC3DecodeContext *s) 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->sampling_rate = hdr.sample_rate; + s->sample_rate = hdr.sample_rate; s->bit_rate = hdr.bit_rate; s->channels = hdr.channels; s->fbw_channels = s->channels - s->lfe_on; @@ -1103,7 +1103,7 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, int *data_size, return -1; } - avctx->sample_rate = s->sampling_rate; + avctx->sample_rate = s->sample_rate; avctx->bit_rate = s->bit_rate; /* check that reported frame size fits in input buffer */ |