diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-29 01:56:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-29 02:16:26 +0200 |
| commit | 706bd8ea19a6f723795547885714033ac68a4d74 (patch) | |
| tree | 39f7933c9432b35801c81903fa7dc352de92fe95 /libavcodec/x86/fft_mmx.asm | |
| parent | 0f8f9248471bbee5649c8efdc52d02c1cf93bba1 (diff) | |
| parent | c83f44dba11930744e167856b48fbc24a8ff0e63 (diff) | |
| download | ffmpeg-706bd8ea19a6f723795547885714033ac68a4d74.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (35 commits)
h264_idct_10bit: port x86 assembly to cpuflags.
x86inc: clip num_args to 7 on x86-32.
x86inc: sync to latest version from x264.
fft: rename "z" to "zc" to prevent name collision.
wv: return meaningful error codes.
wv: return AVERROR_EOF on EOF, not EIO.
mp3dec: forward errors for av_get_packet().
mp3dec: remove a pointless local variable.
mp3dec: remove commented out cruft.
lavfi: bump minor to mark stabilizing the ABI.
FATE: add tests for yadif.
FATE: add a test for delogo video filter.
FATE: add a test for amix audio filter.
audiogen: allow specifying random seed as a commandline parameter.
vc1dec: Override invalid macroblock quantizer
vc1: avoid reading beyond the last line in vc1_draw_sprites()
vc1dec: check that coded slice positions and interlacing match.
vc1dec: Do not ignore ff_vc1_parse_frame_header_adv return value
configure: Move parts that should not be user-selectable to CONFIG_EXTRA
lavf: remove commented out cruft in avformat_find_stream_info()
...
Conflicts:
Makefile
configure
libavcodec/vc1dec.c
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_deblock_10bit.asm
libavcodec/x86/h264dsp_mmx.c
libavfilter/version.h
libavformat/mp3dec.c
libavformat/utils.c
libavformat/wv.c
libavutil/x86/x86inc.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/fft_mmx.asm')
| -rw-r--r-- | libavcodec/x86/fft_mmx.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/x86/fft_mmx.asm b/libavcodec/x86/fft_mmx.asm index 5e5004ca97..a709287f48 100644 --- a/libavcodec/x86/fft_mmx.asm +++ b/libavcodec/x86/fft_mmx.asm @@ -517,23 +517,23 @@ INIT_MMX 3dnow FFT48_3DN -%define Z(x) [zq + o1q*(x&6) + mmsize*(x&1)] -%define Z2(x) [zq + o3q + mmsize*(x&1)] -%define ZH(x) [zq + o1q*(x&6) + mmsize*(x&1) + mmsize/2] -%define Z2H(x) [zq + o3q + mmsize*(x&1) + mmsize/2] +%define Z(x) [zcq + o1q*(x&6) + mmsize*(x&1)] +%define Z2(x) [zcq + o3q + mmsize*(x&1)] +%define ZH(x) [zcq + o1q*(x&6) + mmsize*(x&1) + mmsize/2] +%define Z2H(x) [zcq + o3q + mmsize*(x&1) + mmsize/2] %macro DECL_PASS 2+ ; name, payload align 16 %1: -DEFINE_ARGS z, w, n, o1, o3 +DEFINE_ARGS zc, w, n, o1, o3 lea o3q, [nq*3] lea o1q, [nq*8] shl o3q, 4 .loop: %2 - add zq, mmsize*2 - add wq, mmsize - sub nd, mmsize/8 + add zcq, mmsize*2 + add wq, mmsize + sub nd, mmsize/8 jg .loop rep ret %endmacro @@ -748,7 +748,7 @@ section .text ; On x86_32, this function does the register saving and restoring for all of fft. ; The others pass args in registers and don't spill anything. -cglobal fft_dispatch%2, 2,5,8, z, nbits +cglobal fft_dispatch%2, 2,5,8, zc, nbits FFT_DISPATCH fullsuffix, nbits RET %endmacro ; DECL_FFT |