diff options
author | Justin Ruggles <justin.ruggles@gmail.com> | 2010-12-14 14:52:21 +0000 |
---|---|---|
committer | Justin Ruggles <justin.ruggles@gmail.com> | 2010-12-14 14:52:21 +0000 |
commit | 1607db0a95a1e07b6f7e51fc7db6456b65059860 (patch) | |
tree | 46768f59eaecd2fe95e61a013a1ac6f3c9df83f3 /libavcodec/ac3enc.c | |
parent | 8f60f70d44c14cead6033456c9e58ae7aa9e83cc (diff) | |
download | ffmpeg-1607db0a95a1e07b6f7e51fc7db6456b65059860.tar.gz |
Remove some duplicate local copies of avctx fields.
This is an av_cold function, and we don't need to duplicate variables just to
save a few characters.
Originally committed as revision 25979 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ac3enc.c')
-rw-r--r-- | libavcodec/ac3enc.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 301f8057fd..aa95327ae7 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -1252,8 +1252,6 @@ static av_cold int set_channel_info(AC3EncodeContext *s, int channels, static av_cold int validate_options(AVCodecContext *avctx, AC3EncodeContext *s) { - int freq = avctx->sample_rate; - int bitrate = avctx->bit_rate; int i, j; if (!avctx->channel_layout) { @@ -1269,12 +1267,12 @@ static av_cold int validate_options(AVCodecContext *avctx, AC3EncodeContext *s) /* frequency */ for (i = 0; i < 3; i++) { for (j = 0; j < 3; j++) - if ((ff_ac3_sample_rate_tab[j] >> i) == freq) + if ((ff_ac3_sample_rate_tab[j] >> i) == avctx->sample_rate) goto found; } return -1; found: - s->sample_rate = freq; + s->sample_rate = avctx->sample_rate; s->bit_alloc.sr_shift = i; s->bit_alloc.sr_code = j; s->bitstream_id = 8 + s->bit_alloc.sr_shift; @@ -1282,12 +1280,12 @@ static av_cold int validate_options(AVCodecContext *avctx, AC3EncodeContext *s) /* bitrate & frame size */ for (i = 0; i < 19; i++) { - if ((ff_ac3_bitrate_tab[i] >> s->bit_alloc.sr_shift)*1000 == bitrate) + if ((ff_ac3_bitrate_tab[i] >> s->bit_alloc.sr_shift)*1000 == avctx->bit_rate) break; } if (i == 19) return -1; - s->bit_rate = bitrate; + s->bit_rate = avctx->bit_rate; s->frame_size_code = i << 1; return 0; |