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 /libavcodec/x86/h264_weight.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 'libavcodec/x86/h264_weight.asm')
| -rw-r--r-- | libavcodec/x86/h264_weight.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/x86/h264_weight.asm b/libavcodec/x86/h264_weight.asm index b2fb663e4d..26233bf080 100644 --- a/libavcodec/x86/h264_weight.asm +++ b/libavcodec/x86/h264_weight.asm @@ -127,7 +127,7 @@ WEIGHT_FUNC_HALF_MM 8, 8, sse2 %macro BIWEIGHT_SETUP 0 %if ARCH_X86_64 -%define off_regd r11d +%define off_regd r7d %else %define off_regd r3d %endif @@ -175,7 +175,7 @@ WEIGHT_FUNC_HALF_MM 8, 8, sse2 %endmacro INIT_MMX -cglobal h264_biweight_16_mmx2, 7, 7, 0 +cglobal h264_biweight_16_mmx2, 7, 8, 0 BIWEIGHT_SETUP movifnidn r3d, r3m .nextrow @@ -194,7 +194,7 @@ cglobal h264_biweight_16_mmx2, 7, 7, 0 REP_RET %macro BIWEIGHT_FUNC_MM 3 -cglobal h264_biweight_%1_%3, 7, 7, %2 +cglobal h264_biweight_%1_%3, 7, 8, %2 BIWEIGHT_SETUP movifnidn r3d, r3m .nextrow @@ -215,7 +215,7 @@ INIT_XMM BIWEIGHT_FUNC_MM 16, 8, sse2 %macro BIWEIGHT_FUNC_HALF_MM 3 -cglobal h264_biweight_%1_%3, 7, 7, %2 +cglobal h264_biweight_%1_%3, 7, 8, %2 BIWEIGHT_SETUP movifnidn r3d, r3m sar r3, 1 @@ -245,7 +245,7 @@ BIWEIGHT_FUNC_HALF_MM 8, 8, sse2 %macro BIWEIGHT_SSSE3_SETUP 0 %if ARCH_X86_64 -%define off_regd r11d +%define off_regd r7d %else %define off_regd r3d %endif @@ -284,7 +284,7 @@ BIWEIGHT_FUNC_HALF_MM 8, 8, sse2 %endmacro INIT_XMM -cglobal h264_biweight_16_ssse3, 7, 7, 8 +cglobal h264_biweight_16_ssse3, 7, 8, 8 BIWEIGHT_SSSE3_SETUP movifnidn r3d, r3m @@ -303,7 +303,7 @@ cglobal h264_biweight_16_ssse3, 7, 7, 8 REP_RET INIT_XMM -cglobal h264_biweight_8_ssse3, 7, 7, 8 +cglobal h264_biweight_8_ssse3, 7, 8, 8 BIWEIGHT_SSSE3_SETUP movifnidn r3d, r3m sar r3, 1 |