diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-22 17:58:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-22 17:58:28 +0200 |
| commit | 99497b4683e5054bcdc5b6802a27d717df9e04f3 (patch) | |
| tree | 130022374c1a92b72288272bd0927ae6ac7d825b /libavcodec/ra144enc.c | |
| parent | 0dae193d3ecf5d0dc687f5ad708419bf7600de9a (diff) | |
| parent | 9a9e2f1c8aa4539a261625145e5c1f46a8106ac2 (diff) | |
Merge commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2'
* commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2':
dsputil: Split audio operations off into a separate context
Conflicts:
configure
libavcodec/takdec.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ra144enc.c')
| -rw-r--r-- | libavcodec/ra144enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c index 1f4e5bae45..499c41a038 100644 --- a/libavcodec/ra144enc.c +++ b/libavcodec/ra144enc.c @@ -61,7 +61,7 @@ static av_cold int ra144_encode_init(AVCodecContext * avctx) ractx->lpc_coef[0] = ractx->lpc_tables[0]; ractx->lpc_coef[1] = ractx->lpc_tables[1]; ractx->avctx = avctx; - ff_dsputil_init(&ractx->dsp, avctx); + ff_audiodsp_init(&ractx->adsp); ret = ff_lpc_init(&ractx->lpc_ctx, avctx->frame_size, LPC_ORDER, FF_LPC_TYPE_LEVINSON); if (ret < 0) @@ -374,7 +374,7 @@ static void ra144_encode_subblock(RA144Context *ractx, memcpy(cba, work + LPC_ORDER, sizeof(cba)); ff_copy_and_dup(ractx->buffer_a, ractx->adapt_cb, cba_idx + BLOCKSIZE / 2 - 1); - m[0] = (ff_irms(&ractx->dsp, ractx->buffer_a) * rms) >> 12; + m[0] = (ff_irms(&ractx->adsp, ractx->buffer_a) * rms) >> 12; } fixed_cb_search(work + LPC_ORDER, coefs, data, cba_idx, &cb1_idx, &cb2_idx); for (i = 0; i < BLOCKSIZE; i++) { |