aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-01-29 12:49:24 +0100
committerDiego Biurrun <diego@biurrun.de>2014-03-26 04:31:27 -0700
commitefc7290eb668ce77ef28d0ab9958024d0a35fbe8 (patch)
treeb450ea6566d6055ccdab82f27d9f27df870ffc5f /libavcodec
parent55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6 (diff)
downloadffmpeg-efc7290eb668ce77ef28d0ab9958024d0a35fbe8.tar.gz
x86: hpeldsp: Keep all rnd_template instantiations in hpeldsp_init
There is no point in having a separate file just for the instantiation that provides the public functions.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/x86/Makefile4
-rw-r--r--libavcodec/x86/hpeldsp_init.c9
-rw-r--r--libavcodec/x86/rnd_mmx.c37
3 files changed, 10 insertions, 40 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index 24bf96b29b..eb312a2dd1 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -44,11 +44,9 @@ MMX-OBJS-$(CONFIG_DSPUTIL) += x86/dsputil_mmx.o \
x86/fpel_mmx.o \
x86/idct_mmx_xvid.o \
x86/idct_sse2_xvid.o \
- x86/rnd_mmx.o \
x86/simple_idct.o
MMX-OBJS-$(CONFIG_HPELDSP) += x86/fpel_mmx.o \
- x86/hpeldsp_mmx.o \
- x86/rnd_mmx.o
+ x86/hpeldsp_mmx.o
MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o
diff --git a/libavcodec/x86/hpeldsp_init.c b/libavcodec/x86/hpeldsp_init.c
index 86e41bcb9b..1cc3bacd15 100644
--- a/libavcodec/x86/hpeldsp_init.c
+++ b/libavcodec/x86/hpeldsp_init.c
@@ -128,6 +128,12 @@ CALL_2X_PIXELS(put_no_rnd_pixels16_xy2_mmx, put_no_rnd_pixels8_xy2_mmx, 8)
#include "hpeldsp_rnd_template.c"
#undef DEF
+#define DEF(x, y) ff_ ## x ## _ ## y ## _mmx
+#define STATIC
+
+#include "rnd_template.c"
+
+#undef DEF
#undef SET_RND
#undef PAVGBP
#undef PAVGB
@@ -135,6 +141,9 @@ CALL_2X_PIXELS(put_no_rnd_pixels16_xy2_mmx, put_no_rnd_pixels8_xy2_mmx, 8)
CALL_2X_PIXELS(avg_pixels16_y2_mmx, avg_pixels8_y2_mmx, 8)
CALL_2X_PIXELS(put_pixels16_y2_mmx, put_pixels8_y2_mmx, 8)
+CALL_2X_PIXELS_EXPORT(ff_avg_pixels16_xy2_mmx, ff_avg_pixels8_xy2_mmx, 8)
+CALL_2X_PIXELS_EXPORT(ff_put_pixels16_xy2_mmx, ff_put_pixels8_xy2_mmx, 8)
+
#endif /* HAVE_INLINE_ASM */
diff --git a/libavcodec/x86/rnd_mmx.c b/libavcodec/x86/rnd_mmx.c
deleted file mode 100644
index 44718ebe61..0000000000
--- a/libavcodec/x86/rnd_mmx.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * Libav is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-#include "libavcodec/pixels.h"
-#include "hpeldsp.h"
-#include "inline_asm.h"
-
-#if HAVE_INLINE_ASM
-
-#define DEF(x, y) ff_ ## x ## _ ## y ## _mmx
-#define SET_RND MOVQ_WTWO
-#define PAVGBP(a, b, c, d, e, f) PAVGBP_MMX(a, b, c, d, e, f)
-#define PAVGB(a, b, c, e) PAVGB_MMX(a, b, c, e)
-#define STATIC
-
-#include "rnd_template.c"
-
-CALL_2X_PIXELS_EXPORT(ff_avg_pixels16_xy2_mmx, ff_avg_pixels8_xy2_mmx, 8)
-CALL_2X_PIXELS_EXPORT(ff_put_pixels16_xy2_mmx, ff_put_pixels8_xy2_mmx, 8)
-
-#endif /* HAVE_INLINE_ASM */