From 9ed73b48708b2cc13db5d07c4b6c4c65022cb732 Mon Sep 17 00:00:00 2001 From: Benjamin Larsson Date: Tue, 28 Oct 2008 14:50:46 +0000 Subject: Fix selection of quant step table Originally committed as revision 15734 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/dca.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/dca.c b/libavcodec/dca.c index aa89e848b5..f550483f47 100644 --- a/libavcodec/dca.c +++ b/libavcodec/dca.c @@ -99,6 +99,7 @@ typedef struct { int amode; ///< audio channels arrangement int sample_rate; ///< audio sampling rate int bit_rate; ///< transmission bit rate + int bit_rate_index; ///< transmission bit rate index int downmix; ///< embedded downmix enabled int dynrange; ///< embedded dynamic range flag @@ -247,7 +248,8 @@ static int dca_parse_frame_header(DCAContext * s) s->sample_rate = dca_sample_rates[get_bits(&s->gb, 4)]; if (!s->sample_rate) return -1; - s->bit_rate = dca_bit_rates[get_bits(&s->gb, 5)]; + s->bit_rate_index; = get_bits(&s->gb, 5); + s->bit_rate = dca_bit_rates[s->bit_rate_index]; if (!s->bit_rate) return -1; @@ -852,7 +854,7 @@ static int dca_subsubframe(DCAContext * s) */ /* Select quantization step size table */ - if (s->bit_rate == 0x1f) + if (s->bit_rate_index == 0x1f) quant_step_table = lossless_quant_d; else quant_step_table = lossy_quant_d; -- cgit v1.2.3