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/ra144dec.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/ra144dec.c')
| -rw-r--r-- | libavcodec/ra144dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ra144dec.c b/libavcodec/ra144dec.c index ab7cc68306..29c78229bb 100644 --- a/libavcodec/ra144dec.c +++ b/libavcodec/ra144dec.c @@ -34,7 +34,7 @@ static av_cold int ra144_decode_init(AVCodecContext * avctx) RA144Context *ractx = avctx->priv_data; ractx->avctx = avctx; - ff_dsputil_init(&ractx->dsp, avctx); + ff_audiodsp_init(&ractx->adsp); ractx->lpc_coef[0] = ractx->lpc_tables[0]; ractx->lpc_coef[1] = ractx->lpc_tables[1]; |