diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-28 14:06:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-28 14:11:31 +0100 |
| commit | bb2f4ae434223e99f131100f4bc71762b79eb6c5 (patch) | |
| tree | c852670be02a3ec5972b389a238eabcf59f04095 /libavcodec | |
| parent | 51e9d2dbc8f8e7aed216222a496cc7e588afa217 (diff) | |
| parent | 05b0998f511ffa699407465d48c7d5805f746ad2 (diff) | |
| download | ffmpeg-bb2f4ae434223e99f131100f4bc71762b79eb6c5.tar.gz | |
Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2'
* commit '05b0998f511ffa699407465d48c7d5805f746ad2':
dsputil: Fix error by not using redzone and register name
swscale: GBRP output support
Conflicts:
libswscale/output.c
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/utils.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/hpeldsp.asm | 6 | ||||
| -rw-r--r-- | libavcodec/x86/mpeg4qpel.asm | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/x86/hpeldsp.asm b/libavcodec/x86/hpeldsp.asm index ea366a65c5..72bc111baa 100644 --- a/libavcodec/x86/hpeldsp.asm +++ b/libavcodec/x86/hpeldsp.asm @@ -318,8 +318,8 @@ PUT_NO_RND_PIXELS8_Y2_EXACT ; avg_pixels8(uint8_t *block, const uint8_t *pixels, int line_size, int h) %macro AVG_PIXELS8 0 cglobal avg_pixels8, 4,5 - movsxdifnidn r2, edx - lea r4, [r2+r2] + movsxdifnidn r2, r2d + lea r4, [r2*2] .loop: mova m0, [r0] mova m1, [r0+r2] @@ -349,7 +349,7 @@ AVG_PIXELS8 ; avg_pixels8_x2(uint8_t *block, const uint8_t *pixels, int line_size, int h) %macro AVG_PIXELS8_X2 0 cglobal avg_pixels8_x2, 4,5 - movsxdifnidn r2, edx + movsxdifnidn r2, r2d lea r4, [r2*2] .loop: mova m0, [r1] diff --git a/libavcodec/x86/mpeg4qpel.asm b/libavcodec/x86/mpeg4qpel.asm index 053630356e..fe47bf302e 100644 --- a/libavcodec/x86/mpeg4qpel.asm +++ b/libavcodec/x86/mpeg4qpel.asm @@ -169,7 +169,7 @@ INIT_MMX 3dnow PUT_NO_RND_PIXELS16_l2 %macro MPEG4_QPEL16_H_LOWPASS 1 -cglobal %1_mpeg4_qpel16_h_lowpass, 5, 5, 0, 8 +cglobal %1_mpeg4_qpel16_h_lowpass, 5, 5, 0, 16 movsxdifnidn r2, r2d movsxdifnidn r3, r3d pxor m7, m7 @@ -202,7 +202,7 @@ cglobal %1_mpeg4_qpel16_h_lowpass, 5, 5, 0, 8 paddw m6, [PW_ROUND] paddw m0, m6 psraw m0, 5 - mova [rsp-8], m0 + mova [rsp+8], m0 mova m0, [r1+5] mova m5, m0 mova m6, m0 @@ -226,7 +226,7 @@ cglobal %1_mpeg4_qpel16_h_lowpass, 5, 5, 0, 8 paddw m1, [PW_ROUND] paddw m3, m1 psraw m3, 5 - mova m1, [rsp-8] + mova m1, [rsp+8] packuswb m1, m3 OP_MOV [r0], m1, m4 mova m1, [r1+9] |