diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-13 00:39:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-13 00:39:19 +0200 |
| commit | ca19862d3879dfadfd6c1a1a443eac40fc433385 (patch) | |
| tree | dc114d719849d6c3645063e02378dfddecbc991a /libswscale/x86/scale.asm | |
| parent | 5eeecde859ebfa384fbe3c8a1aa62a6b8f6c58e4 (diff) | |
| parent | 18e8fef7c9292041e3266487d9bc6b59e5eaa798 (diff) | |
| download | ffmpeg-ca19862d3879dfadfd6c1a1a443eac40fc433385.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libxvid: remove disabled code
qdm2: make a table static const
qdm2: simplify bitstream reader setup for some subpacket types
qdm2: use get_bits_left()
build: Consistently handle conditional compilation for all optimization OBJS.
avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics
msrle: convert MS RLE decoding function to bytestream2.
x86inc improvements for 64-bit
Conflicts:
common.mak
libavcodec/avpacket.c
libavcodec/bfi.c
libavcodec/msrledec.c
libavcodec/qdm2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/x86/scale.asm')
| -rw-r--r-- | libswscale/x86/scale.asm | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/libswscale/x86/scale.asm b/libswscale/x86/scale.asm index 068a144c51..a3cb0b1bd6 100644 --- a/libswscale/x86/scale.asm +++ b/libswscale/x86/scale.asm @@ -53,7 +53,7 @@ SECTION .text %ifnidn %3, X cglobal hscale%1to%2_%4, %5, 7, %6, pos0, dst, w, src, filter, fltpos, pos1 %else -cglobal hscale%1to%2_%4, %5, 7, %6, pos0, dst, w, srcmem, filter, fltpos, fltsize +cglobal hscale%1to%2_%4, %5, 10, %6, pos0, dst, w, srcmem, filter, fltpos, fltsize %endif %if ARCH_X86_64 movsxd wq, wd @@ -245,10 +245,9 @@ cglobal hscale%1to%2_%4, %5, 7, %6, pos0, dst, w, srcmem, filter, fltpos, fltsiz %define dlt 0 %endif ; %4 ==/!= X4 %if ARCH_X86_64 - push r12 -%define srcq r11 -%define pos1q r10 -%define srcendq r12 +%define srcq r8 +%define pos1q r7 +%define srcendq r9 movsxd fltsizeq, fltsized ; filterSize lea srcendq, [srcmemq+(fltsizeq-dlt)*srcmul] ; &src[filterSize&~4] %else ; x86-32 @@ -388,16 +387,7 @@ cglobal hscale%1to%2_%4, %5, 7, %6, pos0, dst, w, srcmem, filter, fltpos, fltsiz add wq, 2 %endif ; %3 ==/!= X jl .loop -%ifnidn %3, X REP_RET -%else ; %3 == X -%if ARCH_X86_64 - pop r12 - RET -%else ; x86-32 - REP_RET -%endif ; x86-32/64 -%endif ; %3 ==/!= X %endmacro ; SCALE_FUNCS source_width, intermediate_nbits, n_xmm |