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 | |
| parent | fdb1f7eb7a802eec63a051499110842f3056cf9b (diff) | |
| parent | 2957d29f0531ccd8a6f4378293424dfd92db3044 (diff) | |
| download | ffmpeg-6ec26157b96b74a26c5148bffbf862920a1afc34.tar.gz | |
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')
| -rw-r--r-- | libavcodec/alpha/dsputil_alpha_asm.S | 11 | ||||
| -rw-r--r-- | libavcodec/alpha/hpeldsp_alpha.c | 3 | ||||
| -rw-r--r-- | libavcodec/alpha/hpeldsp_alpha.h | 1 | ||||
| -rw-r--r-- | libavcodec/alpha/hpeldsp_alpha_asm.S | 10 | ||||
| -rw-r--r-- | libavcodec/alpha/regdef.h | 11 |
5 files changed, 14 insertions, 22 deletions
diff --git a/libavcodec/alpha/dsputil_alpha_asm.S b/libavcodec/alpha/dsputil_alpha_asm.S index 5c5f90a989..d801bcf5ce 100644 --- a/libavcodec/alpha/dsputil_alpha_asm.S +++ b/libavcodec/alpha/dsputil_alpha_asm.S @@ -26,17 +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 .arch pca56 diff --git a/libavcodec/alpha/hpeldsp_alpha.c b/libavcodec/alpha/hpeldsp_alpha.c index 9a092f57de..8d54807d8f 100644 --- a/libavcodec/alpha/hpeldsp_alpha.c +++ b/libavcodec/alpha/hpeldsp_alpha.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavcodec/hpeldsp.h" #include "hpeldsp_alpha.h" #include "asm.h" @@ -173,7 +174,7 @@ static void put_pixels16_axp_asm(uint8_t *block, const uint8_t *pixels, put_pixels_axp_asm(block + 8, pixels + 8, line_size, h); } -void ff_hpeldsp_init_alpha(HpelDSPContext* c, int flags) +av_cold void ff_hpeldsp_init_alpha(HpelDSPContext *c, int flags) { c->put_pixels_tab[0][0] = put_pixels16_axp_asm; c->put_pixels_tab[0][1] = put_pixels16_x2_axp; diff --git a/libavcodec/alpha/hpeldsp_alpha.h b/libavcodec/alpha/hpeldsp_alpha.h index 53e8604acd..985182c67b 100644 --- a/libavcodec/alpha/hpeldsp_alpha.h +++ b/libavcodec/alpha/hpeldsp_alpha.h @@ -20,6 +20,7 @@ #define AVCODEC_ALPHA_HPELDSP_ALPHA_H #include <stdint.h> +#include <stddef.h> void put_pixels_axp_asm(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h); 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 diff --git a/libavcodec/alpha/regdef.h b/libavcodec/alpha/regdef.h index aa1959f46e..f05577a89b 100644 --- a/libavcodec/alpha/regdef.h +++ b/libavcodec/alpha/regdef.h @@ -63,4 +63,15 @@ #define sp $30 /* stack pointer */ #define zero $31 /* reads as zero, writes are noops */ +/* 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 + #endif /* AVCODEC_ALPHA_REGDEF_H */ |