diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 15:18:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 15:18:57 +0100 |
| commit | 2cf9ab655549cf2f25ba57ee84baa6d38530ec3b (patch) | |
| tree | ae0a70dc008a9dfccd0b313f6888665662c048a0 /libavcodec/dsputil.h | |
| parent | 248140f8a2a6a00a668f59607791d24244a8ff50 (diff) | |
| parent | 8a4f26206d7914eaf2903954ce97cb7686933382 (diff) | |
| download | ffmpeg-2cf9ab655549cf2f25ba57ee84baa6d38530ec3b.tar.gz | |
Merge commit '8a4f26206d7914eaf2903954ce97cb7686933382'
* commit '8a4f26206d7914eaf2903954ce97cb7686933382':
dsputil: remove butterflies_float_interleave.
srtp: Move a variable to a local scope
srtp: Add tests for the crypto suite with 32/80 bit HMAC
Conflicts:
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 49005e46e1..9b0aab372a 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -382,23 +382,6 @@ typedef struct DSPContext { */ void (*butterflies_float)(float *av_restrict v1, float *av_restrict v2, int len); - /** - * Calculate the sum and difference of two vectors of floats and interleave - * results into a separate output vector of floats, with each sum - * positioned before the corresponding difference. - * - * @param dst output vector - * constraints: 16-byte aligned - * @param src0 first input vector - * constraints: 32-byte aligned - * @param src1 second input vector - * constraints: 32-byte aligned - * @param len number of elements in the input - * constraints: multiple of 8 - */ - void (*butterflies_float_interleave)(float *dst, const float *src0, - const float *src1, int len); - /* (I)DCT */ void (*fdct)(DCTELEM *block/* align 16*/); void (*fdct248)(DCTELEM *block/* align 16*/); |