diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 01:54:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 01:54:19 +0100 |
| commit | 9f1792982eb69782fa6d1ff0ab5d11d21bd451df (patch) | |
| tree | 065764c63ed21400552f726beeaa2cde52ff9a17 /libavcodec/g722enc.c | |
| parent | 47df21e1727c83648a645b0dde34e99f1b7bdc93 (diff) | |
| parent | 10f160768b824f00933f33bc69f1fae89a25dfc8 (diff) | |
| download | ffmpeg-9f1792982eb69782fa6d1ff0ab5d11d21bd451df.tar.gz | |
Merge commit '10f160768b824f00933f33bc69f1fae89a25dfc8'
* commit '10f160768b824f00933f33bc69f1fae89a25dfc8':
g722: Reduce number of pointers passed to g722_apply_qmf() function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722enc.c')
| -rw-r--r-- | libavcodec/g722enc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c index c982a0eb78..5a7bfb25fe 100644 --- a/libavcodec/g722enc.c +++ b/libavcodec/g722enc.c @@ -138,12 +138,12 @@ static const int16_t low_quant[33] = { static inline void filter_samples(G722Context *c, const int16_t *samples, int *xlow, int *xhigh) { - int xout1, xout2; + int xout[2]; c->prev_samples[c->prev_samples_pos++] = samples[0]; c->prev_samples[c->prev_samples_pos++] = samples[1]; - c->dsp.apply_qmf(c->prev_samples + c->prev_samples_pos - 24, &xout1, &xout2); - *xlow = xout1 + xout2 >> 14; - *xhigh = xout1 - xout2 >> 14; + c->dsp.apply_qmf(c->prev_samples + c->prev_samples_pos - 24, xout); + *xlow = xout[0] + xout[1] >> 14; + *xhigh = xout[0] - xout[1] >> 14; if (c->prev_samples_pos >= PREV_SAMPLES_BUF_SIZE) { memmove(c->prev_samples, c->prev_samples + c->prev_samples_pos - 22, |