diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 13:17:48 +0100 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 13:17:48 +0100 |
commit | d03da3e24020e9ef7b7558c0f1741331d46c2c21 (patch) | |
tree | b03b455c8382c45ed096d291d8007e2f90eb20cf /libavcodec/dcadec.c | |
parent | af1238f863fda4a1a6fc00525b651a3d9b31eccd (diff) | |
parent | 2008f76054906e9ff6bf744800af0e5a5bfe61be (diff) |
Merge commit '2008f76054906e9ff6bf744800af0e5a5bfe61be'
* commit '2008f76054906e9ff6bf744800af0e5a5bfe61be':
dca: remove unused decode_hf function and quant_d tables
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/dcadec.c')
-rw-r--r-- | libavcodec/dcadec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 258857a563..187e1728be 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -992,12 +992,12 @@ static int dca_subsubframe(DCAContext *s, int base_channel, int block_index) s->debug_flag |= 0x01; } - s->dcadsp.decode_hf_int(subband_samples, s->dca_chan[k].high_freq_vq, - ff_dca_high_freq_vq, subsubframe * SAMPLES_PER_SUBBAND, - s->dca_chan[k].scale_factor, - s->audio_header.vq_start_subband[k], - s->audio_header.subband_activity[k]); - + s->dcadsp.decode_hf(subband_samples, s->dca_chan[k].high_freq_vq, + ff_dca_high_freq_vq, + subsubframe * SAMPLES_PER_SUBBAND, + s->dca_chan[k].scale_factor, + s->audio_header.vq_start_subband[k], + s->audio_header.subband_activity[k]); } } |