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/dcadsp.h | |
parent | af1238f863fda4a1a6fc00525b651a3d9b31eccd (diff) | |
parent | 2008f76054906e9ff6bf744800af0e5a5bfe61be (diff) | |
download | ffmpeg-d03da3e24020e9ef7b7558c0f1741331d46c2c21.tar.gz |
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/dcadsp.h')
-rw-r--r-- | libavcodec/dcadsp.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavcodec/dcadsp.h b/libavcodec/dcadsp.h index 24902cb1ca..ccb2955470 100644 --- a/libavcodec/dcadsp.h +++ b/libavcodec/dcadsp.h @@ -32,16 +32,11 @@ typedef struct DCADSPContext { int *synth_buf_offset, float synth_buf2[32], const float window[512], float *samples_out, float raXin[32], float scale); - void (*decode_hf)(float dst[DCA_SUBBANDS][8], + void (*decode_hf)(int32_t dst[DCA_SUBBANDS][8], const int32_t vq_num[DCA_SUBBANDS], const int8_t hf_vq[1024][32], intptr_t vq_offset, int32_t scale[DCA_SUBBANDS][2], intptr_t start, intptr_t end); - void (*decode_hf_int)(int32_t dst[DCA_SUBBANDS][8], - const int32_t vq_num[DCA_SUBBANDS], - const int8_t hf_vq[1024][32], intptr_t vq_offset, - int32_t scale[DCA_SUBBANDS][2], - intptr_t start, intptr_t end); void (*dequantize)(int32_t *samples, uint32_t step_size, uint32_t scale); } DCADSPContext; |