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/output.asm | |
| parent | 5eeecde859ebfa384fbe3c8a1aa62a6b8f6c58e4 (diff) | |
| parent | 18e8fef7c9292041e3266487d9bc6b59e5eaa798 (diff) | |
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/output.asm')
| -rw-r--r-- | libswscale/x86/output.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm index 874fac21af..01a946f7b3 100644 --- a/libswscale/x86/output.asm +++ b/libswscale/x86/output.asm @@ -62,11 +62,11 @@ SECTION .text %define cntr_reg fltsizeq %define movsx mov %else -%define cntr_reg r11 +%define cntr_reg r7 %define movsx movsxd %endif -cglobal yuv2planeX_%1, %3, 7, %2, filter, fltsize, src, dst, w, dither, offset +cglobal yuv2planeX_%1, %3, 8, %2, filter, fltsize, src, dst, w, dither, offset %if %1 == 8 || %1 == 9 || %1 == 10 pxor m6, m6 %endif ; %1 == 8/9/10 |