diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-11 12:17:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-11 12:18:05 +0100 |
| commit | bec37935ec28ad8d5c22a8adc977d833e8b1963c (patch) | |
| tree | 2438c19710c794d142809fd3d66e44596961c2f8 /libavcodec | |
| parent | 514910fb2d3b373fd80a5c6e6568e16490631378 (diff) | |
| parent | 6cd796049dc06eabe1a9714290713bd31024af9e (diff) | |
| download | ffmpeg-bec37935ec28ad8d5c22a8adc977d833e8b1963c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: h264_qpel_10bit: drop unused parameter from MC10/MC20/MC30 macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/h264_qpel_10bit.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/x86/h264_qpel_10bit.asm b/libavcodec/x86/h264_qpel_10bit.asm index c05c7a64d8..e14df84431 100644 --- a/libavcodec/x86/h264_qpel_10bit.asm +++ b/libavcodec/x86/h264_qpel_10bit.asm @@ -232,7 +232,7 @@ INIT_XMM sse2, cache64 INIT_XMM ssse3, cache64 %1 put, 8 INIT_XMM sse2 -%1 put, 8, 0 +%1 put, 8 %define OP_MOV AVG_MOV INIT_MMX mmxext @@ -242,10 +242,10 @@ INIT_XMM sse2, cache64 INIT_XMM ssse3, cache64 %1 avg, 8 INIT_XMM sse2 -%1 avg, 8, 0 +%1 avg, 8 %endmacro -%macro MC20 2-3 +%macro MC20 2 cglobal_mc %1, mc20, %2, 3,4,9 mov r3d, %2 mova m1, [pw_pixel_max] @@ -307,7 +307,7 @@ MC_CACHE MC20 ;----------------------------------------------------------------------------- ; 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 lea r4, [r1+2] 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) ;----------------------------------------------------------------------------- -%macro MC10 2-3 +%macro MC10 2 cglobal_mc %1, mc10, %2, 3,5,9 mov r4, r1 .body: |