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/ra144.h | |
| parent | 0dae193d3ecf5d0dc687f5ad708419bf7600de9a (diff) | |
| parent | 9a9e2f1c8aa4539a261625145e5c1f46a8106ac2 (diff) | |
| download | ffmpeg-99497b4683e5054bcdc5b6802a27d717df9e04f3.tar.gz | |
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/ra144.h')
| -rw-r--r-- | libavcodec/ra144.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/ra144.h b/libavcodec/ra144.h index c2ee59b2dc..c1ceb87341 100644 --- a/libavcodec/ra144.h +++ b/libavcodec/ra144.h @@ -25,7 +25,7 @@ #include <stdint.h> #include "lpc.h" #include "audio_frame_queue.h" -#include "dsputil.h" +#include "audiodsp.h" #define NBLOCKS 4 ///< number of subblocks within a block #define BLOCKSIZE 40 ///< subblock size in 16-bit words @@ -36,7 +36,7 @@ typedef struct RA144Context { AVCodecContext *avctx; - DSPContext dsp; + AudioDSPContext adsp; LPCContext lpc_ctx; AudioFrameQueue afq; int last_frame; @@ -72,7 +72,7 @@ unsigned int ff_rms(const int *data); int ff_interp(RA144Context *ractx, int16_t *out, int a, int copyold, int energy); unsigned int ff_rescale_rms(unsigned int rms, unsigned int energy); -int ff_irms(DSPContext *dsp, const int16_t *data/*align 16*/); +int ff_irms(AudioDSPContext *adsp, const int16_t *data/*align 16*/); void ff_subblock_synthesis(RA144Context *ractx, const int16_t *lpc_coefs, int cba_idx, int cb1_idx, int cb2_idx, int gval, int gain); |