diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-23 04:16:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-23 04:29:51 +0200 |
| commit | 01a73d6cef70dfa90fdf79f7afd55b817b4c9342 (patch) | |
| tree | 6439c123a8368d7e2830d90d7b47725c5efe5f1c /libavcodec/x86/fmtconvert.asm | |
| parent | 0753721ed1caab048b58db15ebfdf45569e83420 (diff) | |
| parent | a121754852a69b4879a39ba78863404c13c54f61 (diff) | |
| download | ffmpeg-01a73d6cef70dfa90fdf79f7afd55b817b4c9342.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ffmpeg: Don't trigger url_interrupt_cb on the first signal
avoptions: Check the return value from av_get_number
dct32_sse: eliminate some spills
Fix dct32() compilation with --disable-yasm
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/fmtconvert.asm')
| -rw-r--r-- | libavcodec/x86/fmtconvert.asm | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/libavcodec/x86/fmtconvert.asm b/libavcodec/x86/fmtconvert.asm index c4a9a66009..598e412f73 100644 --- a/libavcodec/x86/fmtconvert.asm +++ b/libavcodec/x86/fmtconvert.asm @@ -95,13 +95,6 @@ FLOAT_TO_INT16_INTERLEAVE6 3dn2 ; void ff_float_interleave6(float *dst, const float **src, unsigned int len); ;----------------------------------------------------------------------------- -%macro BUTTERFLYPS 3 - movaps m%3, m%1 - unpcklps m%1, m%2 - unpckhps m%3, m%2 - SWAP %2, %3 -%endmacro - %macro FLOAT_INTERLEAVE6 2 cglobal float_interleave6_%1, 2,7,%2, dst, src, src1, src2, src3, src4, src5 %ifdef ARCH_X86_64 @@ -130,9 +123,9 @@ cglobal float_interleave6_%1, 2,7,%2, dst, src, src1, src2, src3, src4, src5 movaps m4, [srcq+src4q] movaps m5, [srcq+src5q] - BUTTERFLYPS 0, 1, 6 - BUTTERFLYPS 2, 3, 6 - BUTTERFLYPS 4, 5, 6 + SBUTTERFLYPS 0, 1, 6 + SBUTTERFLYPS 2, 3, 6 + SBUTTERFLYPS 4, 5, 6 movaps m6, m4 shufps m4, m0, 0xe4 |