diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 15:11:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 15:11:06 +0200 |
| commit | fdb1f7eb7a802eec63a051499110842f3056cf9b (patch) | |
| tree | c4421b73f26a9e16602438641af598b48958a82b /libavcodec/sparc/vis.h | |
| parent | 4bdec0e71edc3b46793908eaca26864657497cc1 (diff) | |
| parent | 78ce568e43a7f3993c33100aa8f5d56c4c4bd493 (diff) | |
| download | ffmpeg-fdb1f7eb7a802eec63a051499110842f3056cf9b.tar.gz | |
Merge commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493'
* commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493':
sparc: hpeldsp: Move vis half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/hpeldsp.h
libavcodec/sparc/dsputil_vis.c
libavcodec/sparc/hpeldsp_vis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sparc/vis.h')
| -rw-r--r-- | libavcodec/sparc/vis.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libavcodec/sparc/vis.h b/libavcodec/sparc/vis.h index adee91bd6f..af5b5fa79e 100644 --- a/libavcodec/sparc/vis.h +++ b/libavcodec/sparc/vis.h @@ -42,6 +42,17 @@ #ifndef AVCODEC_SPARC_VIS_H #define AVCODEC_SPARC_VIS_H +#define ACCEL_SPARC_VIS 1 +#define ACCEL_SPARC_VIS2 2 + +static inline int vis_level(void) +{ + int accel = 0; + accel |= ACCEL_SPARC_VIS; + accel |= ACCEL_SPARC_VIS2; + return accel; +} + #define vis_opc_base ((0x1 << 31) | (0x36 << 19)) #define vis_opf(X) ((X) << 5) #define vis_sreg(X) (X) |