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/g729postfilter.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/g729postfilter.h')
| -rw-r--r-- | libavcodec/g729postfilter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/g729postfilter.h b/libavcodec/g729postfilter.h index 5239fc80dd..89e3e40cea 100644 --- a/libavcodec/g729postfilter.h +++ b/libavcodec/g729postfilter.h @@ -22,7 +22,7 @@ #define FFMPEG_G729POSTFILTER_H #include <stdint.h> -#include "dsputil.h" +#include "audiodsp.h" /** * tilt compensation factor (G.729, k1>0) @@ -94,7 +94,7 @@ * Short-term postfilter (4.2.2). * Tilt-compensation (4.2.3) */ -void ff_g729_postfilter(DSPContext *dsp, int16_t* ht_prev_data, int* voicing, +void ff_g729_postfilter(AudioDSPContext *adsp, int16_t* ht_prev_data, int* voicing, const int16_t *lp_filter_coeffs, int pitch_delay_int, int16_t* residual, int16_t* res_filter_data, int16_t* pos_filter_data, int16_t *speech, |