diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 01:45:50 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 01:46:35 +0100 |
commit | 47df21e1727c83648a645b0dde34e99f1b7bdc93 (patch) | |
tree | ed098a84b05dde35955ca00471464be09a6eba78 /libavcodec/g722enc.c | |
parent | 38e641a060e0c00930851a8053ca96250b3ecccc (diff) | |
parent | 67690683130faf37dd9d969ced15eba2a1940ade (diff) |
Merge commit '67690683130faf37dd9d969ced15eba2a1940ade'
* commit '67690683130faf37dd9d969ced15eba2a1940ade':
g722: Split out g722_qmf_apply() function into g722dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722enc.c')
-rw-r--r-- | libavcodec/g722enc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c index 17dde9ec80..c982a0eb78 100644 --- a/libavcodec/g722enc.c +++ b/libavcodec/g722enc.c @@ -120,6 +120,8 @@ static av_cold int g722_encode_init(AVCodecContext * avctx) } } + ff_g722dsp_init(&c->dsp); + return 0; error: g722_encode_close(avctx); @@ -139,7 +141,7 @@ static inline void filter_samples(G722Context *c, const int16_t *samples, int xout1, xout2; c->prev_samples[c->prev_samples_pos++] = samples[0]; c->prev_samples[c->prev_samples_pos++] = samples[1]; - ff_g722_apply_qmf(c->prev_samples + c->prev_samples_pos - 24, &xout1, &xout2); + c->dsp.apply_qmf(c->prev_samples + c->prev_samples_pos - 24, &xout1, &xout2); *xlow = xout1 + xout2 >> 14; *xhigh = xout1 - xout2 >> 14; if (c->prev_samples_pos >= PREV_SAMPLES_BUF_SIZE) { |