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/dsputil_vis.c | |
| 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/dsputil_vis.c')
| -rw-r--r-- | libavcodec/sparc/dsputil_vis.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/libavcodec/sparc/dsputil_vis.c b/libavcodec/sparc/dsputil_vis.c index 9c3494bc45..414d6ca50e 100644 --- a/libavcodec/sparc/dsputil_vis.c +++ b/libavcodec/sparc/dsputil_vis.c @@ -18,33 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* The *no_round* functions have been added by James A. Morrison, 2003,2004. - The vis code from libmpeg2 was adapted for libavcodec by James A. Morrison. - */ - -#include "config.h" - -#include <inttypes.h> - #include "libavutil/attributes.h" #include "libavcodec/dsputil.h" -#include "libavutil/mem.h" #include "dsputil_vis.h" - #include "vis.h" -#define ACCEL_SPARC_VIS 1 -#define ACCEL_SPARC_VIS2 2 - -static int vis_level(void) -{ - int accel = 0; - accel |= ACCEL_SPARC_VIS; - accel |= ACCEL_SPARC_VIS2; - return accel; -} - -/* libavcodec initialization code */ av_cold void ff_dsputil_init_vis(DSPContext *c, AVCodecContext *avctx) { /* VIS-specific optimizations */ |