diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 03:54:14 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 03:54:19 +0300 |
| commit | 9f1792982eb69782fa6d1ff0ab5d11d21bd451df (patch) | |
| tree | 065764c63ed21400552f726beeaa2cde52ff9a17 /libavcodec/g722dec.c | |
| parent | 47df21e1727c83648a645b0dde34e99f1b7bdc93 (diff) | |
| parent | 10f160768b824f00933f33bc69f1fae89a25dfc8 (diff) | |
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/g722dec.c')
| -rw-r--r-- | libavcodec/g722dec.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/g722dec.c b/libavcodec/g722dec.c index 84540dc010..0b207ffbca 100644 --- a/libavcodec/g722dec.c +++ b/libavcodec/g722dec.c @@ -104,7 +104,7 @@ static int g722_decode_frame(AVCodecContext *avctx, void *data, for (j = 0; j < avpkt->size; j++) { int ilow, ihigh, rlow, rhigh, dhigh; - int xout1, xout2; + int xout[2]; ihigh = get_bits(&gb, 2); ilow = get_bits(&gb, 6 - skip); @@ -122,10 +122,9 @@ static int g722_decode_frame(AVCodecContext *avctx, void *data, c->prev_samples[c->prev_samples_pos++] = rlow + rhigh; c->prev_samples[c->prev_samples_pos++] = rlow - rhigh; - c->dsp.apply_qmf(c->prev_samples + c->prev_samples_pos - 24, - &xout1, &xout2); - *out_buf++ = av_clip_int16(xout1 >> 11); - *out_buf++ = av_clip_int16(xout2 >> 11); + c->dsp.apply_qmf(c->prev_samples + c->prev_samples_pos - 24, xout); + *out_buf++ = av_clip_int16(xout[0] >> 11); + *out_buf++ = av_clip_int16(xout[1] >> 11); if (c->prev_samples_pos >= PREV_SAMPLES_BUF_SIZE) { memmove(c->prev_samples, c->prev_samples + c->prev_samples_pos - 22, 22 * sizeof(c->prev_samples[0])); |