highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  x86: h264_qpel_10bit: drop unused parameter from MC10/MC20/MC30 macros

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-11-11 12:17:57 +01:00
commit bec37935ec
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/x86/h264_qpel_10bit.asm
View File

@ -232,7 +232,7 @@ INIT_XMM sse2, cache64
INIT_XMM ssse3, cache64 INIT_XMM ssse3, cache64
%1 put, 8 %1 put, 8
INIT_XMM sse2 INIT_XMM sse2
%1 put, 8, 0 %1 put, 8
%define OP_MOV AVG_MOV %define OP_MOV AVG_MOV
INIT_MMX mmxext INIT_MMX mmxext
@ -242,10 +242,10 @@ INIT_XMM sse2, cache64
INIT_XMM ssse3, cache64 INIT_XMM ssse3, cache64
%1 avg, 8 %1 avg, 8
INIT_XMM sse2 INIT_XMM sse2
%1 avg, 8, 0 %1 avg, 8
%endmacro %endmacro
%macro MC20 2-3 %macro MC20 2
cglobal_mc %1, mc20, %2, 3,4,9 cglobal_mc %1, mc20, %2, 3,4,9
mov r3d, %2 mov r3d, %2
mova m1, [pw_pixel_max] mova m1, [pw_pixel_max]
@ -307,7 +307,7 @@ MC_CACHE MC20
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void h264_qpel_mc30(uint8_t *dst, uint8_t *src, int stride) ; void h264_qpel_mc30(uint8_t *dst, uint8_t *src, int stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro MC30 2-3 %macro MC30 2
cglobal_mc %1, mc30, %2, 3,5,9 cglobal_mc %1, mc30, %2, 3,5,9
lea r4, [r1+2] lea r4, [r1+2]
jmp stub_%1_h264_qpel%2_mc10_10 %+ SUFFIX %+ .body jmp stub_%1_h264_qpel%2_mc10_10 %+ SUFFIX %+ .body
@ -318,7 +318,7 @@ MC_CACHE MC30
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void h264_qpel_mc10(uint8_t *dst, uint8_t *src, int stride) ; void h264_qpel_mc10(uint8_t *dst, uint8_t *src, int stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro MC10 2-3 %macro MC10 2
cglobal_mc %1, mc10, %2, 3,5,9 cglobal_mc %1, mc10, %2, 3,5,9
mov r4, r1 mov r4, r1
.body: .body: