generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cosmetics: rename sampling_rate to sample_rate

Browse Source 
Originally committed as revision 11358 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2007-12-30 21:26:30 +00:00
parent 0345fade94
commit 866181e5e8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/ac3dec.c
View File

@ -145,7 +145,7 @@ typedef struct {
uint8_t dba_lengths[AC3_MAX_CHANNELS][8]; ///< delta segment lengths uint8_t dba_lengths[AC3_MAX_CHANNELS][8]; ///< delta segment lengths
uint8_t dba_values[AC3_MAX_CHANNELS][8]; ///< delta values for each segment 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 bit_rate; ///< stream bit rate, in bits-per-second
int frame_size; ///< current frame size, in bytes 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]]; surround_mix_level = gain_levels[surround_levels[hdr.surround_mix_level]];
s->lfe_on = hdr.lfe_on; s->lfe_on = hdr.lfe_on;
s->bit_alloc_params.sr_shift = hdr.sr_shift; 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->bit_rate = hdr.bit_rate;
s->channels = hdr.channels; s->channels = hdr.channels;
s->fbw_channels = s->channels - s->lfe_on; 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; return -1;
} }
avctx->sample_rate = s->sampling_rate; avctx->sample_rate = s->sample_rate;
avctx->bit_rate = s->bit_rate; avctx->bit_rate = s->bit_rate;
/* check that reported frame size fits in input buffer */ /* check that reported frame size fits in input buffer */