diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 15:24:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 15:24:25 +0200 |
| commit | 6ec26157b96b74a26c5148bffbf862920a1afc34 (patch) | |
| tree | e42fc16ac43e0ce3d5a03f596b50b4c03caebae6 /libavcodec/alpha/hpeldsp_alpha_asm.S | |
| parent | fdb1f7eb7a802eec63a051499110842f3056cf9b (diff) | |
| parent | 2957d29f0531ccd8a6f4378293424dfd92db3044 (diff) | |
Merge commit '2957d29f0531ccd8a6f4378293424dfd92db3044'
* commit '2957d29f0531ccd8a6f4378293424dfd92db3044':
alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/alpha/dsputil_alpha.c
libavcodec/alpha/hpeldsp_alpha.c
libavcodec/alpha/hpeldsp_alpha.h
libavcodec/alpha/hpeldsp_alpha_asm.S
libavcodec/hpeldsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/alpha/hpeldsp_alpha_asm.S')
| -rw-r--r-- | libavcodec/alpha/hpeldsp_alpha_asm.S | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/alpha/hpeldsp_alpha_asm.S b/libavcodec/alpha/hpeldsp_alpha_asm.S index afc3d423eb..df386c429e 100644 --- a/libavcodec/alpha/hpeldsp_alpha_asm.S +++ b/libavcodec/alpha/hpeldsp_alpha_asm.S @@ -26,16 +26,6 @@ #include "regdef.h" -/* Some nicer register names. */ -#define ta t10 -#define tb t11 -#define tc t12 -#define td AT -/* Danger: these overlap with the argument list and the return value */ -#define te a5 -#define tf a4 -#define tg a3 -#define th v0 .set noat .set noreorder |