diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 01:39:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 01:40:54 +0200 |
| commit | b0387edd5e766b1032f946d6cdb35b765bb45435 (patch) | |
| tree | dd3ca8577a8d3b05efee8b1214a80f845ddeb47f /libavutil/x86/x86util.asm | |
| parent | 8619362ff1de6605ffe6da8a42bdfe4fb7be75c1 (diff) | |
| parent | f919cc7df6ab844bc12f89fe7bef4fb915a47725 (diff) | |
| download | ffmpeg-b0387edd5e766b1032f946d6cdb35b765bb45435.tar.gz | |
Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'
* commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725':
fate: fix acodec/vsynth tests for make 3.81
pcm_mpeg: fix number of consumed bytes to include the header.
avfilter: include required header file avfilter.h in video.h
x86: Avoid movs on BUTTERFLYPS when in AVX mode
x86: use new schema for ASM macros
fate: convert codec-regression.sh to makefile rules
fate: allow tests to specify unit size for psnr comparison
fate: teach videogen/rotozoom to output a single raw video stream
http: Add support for reusing the http socket for subsequent requests
http: Add support for using persistent connections
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86/x86util.asm')
| -rw-r--r-- | libavutil/x86/x86util.asm | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm index 258626af21..34959f2c94 100644 --- a/libavutil/x86/x86util.asm +++ b/libavutil/x86/x86util.asm @@ -84,13 +84,12 @@ %macro TRANSPOSE4x4PS 5 SBUTTERFLYPS %1, %2, %5 SBUTTERFLYPS %3, %4, %5 - movaps m%5, m%1 - movlhps m%1, m%3 - movhlps m%3, m%5 - movaps m%5, m%2 - movlhps m%2, m%4 - movhlps m%4, m%5 - SWAP %2, %3 + movlhps m%5, m%1, m%3 + movhlps m%3, m%1 + SWAP %5, %1 + movlhps m%5, m%2, m%4 + movhlps m%4, m%2 + SWAP %5, %2, %3 %endmacro %macro TRANSPOSE8x8W 9-11 |