diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 07:12:40 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 07:12:40 +0400 |
| commit | 8e70fdab3614a5ef709d60b67c6729c3eca93c21 (patch) | |
| tree | e18aa3e652eb2ec4949bd4186e49aa385a0d39a8 /libavcodec/dsputil.h | |
| parent | a12f679a5db9a2069f58a993317720c5b4f82c27 (diff) | |
| parent | 4958f35a2ebc307049ff2104ffb944f5f457feb3 (diff) | |
Merge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3'
* commit '4958f35a2ebc307049ff2104ffb944f5f457feb3':
dsputil: Move apply_window_int16 to ac3dsp
Conflicts:
libavcodec/arm/ac3dsp_init_arm.c
libavcodec/arm/ac3dsp_neon.S
libavcodec/x86/ac3dsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 0a8521d8a4..0897c560b4 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -275,20 +275,6 @@ typedef struct DSPContext { int32_t (*scalarproduct_and_madd_int16)(int16_t *v1/*align 16*/, const int16_t *v2, const int16_t *v3, int len, int mul); /** - * Apply symmetric window in 16-bit fixed-point. - * @param output destination array - * constraints: 16-byte aligned - * @param input source array - * constraints: 16-byte aligned - * @param window window array - * constraints: 16-byte aligned, at least len/2 elements - * @param len full window length - * constraints: multiple of ? greater than zero - */ - void (*apply_window_int16)(int16_t *output, const int16_t *input, - const int16_t *window, unsigned int len); - - /** * Clip each element in an array of int32_t to a given minimum and maximum value. * @param dst destination array * constraints: 16-byte aligned |