Merge commit '6655c933a887a2d20707fff657b614aa1d86a25b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 22:02:46 +0000 (23:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 22:08:22 +0000 (23:08 +0100)
* commit '6655c933a887a2d20707fff657b614aa1d86a25b':
  x86: dsputil: Move fpel declarations to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/cavsdsp.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
libavcodec/x86/fpel.h [new file with mode: 0644]
libavcodec/x86/fpel_mmx.c
libavcodec/x86/h264_qpel.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/vc1dsp_init.c
libavcodec/x86/vc1dsp_mmx.c

index 805e120..2eb696e 100644 (file)
@@ -30,6 +30,7 @@
 #include "libavcodec/cavsdsp.h"
 #include "constants.h"
 #include "dsputil_x86.h"
+#include "fpel.h"
 #include "config.h"
 
 #if HAVE_MMX_INLINE
index d9426c8..6c7b521 100644 (file)
@@ -31,6 +31,7 @@
 #include "libavcodec/simple_idct.h"
 #include "libavcodec/version.h"
 #include "dsputil_x86.h"
+#include "fpel.h"
 #include "idct_xvid.h"
 
 void ff_put_pixels8_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2,
index 5153e18..c574458 100644 (file)
@@ -31,6 +31,7 @@
 #include "constants.h"
 #include "diracdsp_mmx.h"
 #include "dsputil_x86.h"
+#include "fpel.h"
 #include "inline_asm.h"
 
 #if HAVE_INLINE_ASM
index c848d58..6985042 100644 (file)
@@ -66,23 +66,6 @@ void ff_gmc_sse(uint8_t *dst, uint8_t *src,
 void ff_vector_clipf_sse(float *dst, const float *src,
                          float min, float max, int len);
 
-void ff_avg_pixels8_mmx(uint8_t *block, const uint8_t *pixels,
-                        ptrdiff_t line_size, int h);
-void ff_avg_pixels16_mmx(uint8_t *block, const uint8_t *pixels,
-                         ptrdiff_t line_size, int h);
-void ff_put_pixels8_mmx(uint8_t *block, const uint8_t *pixels,
-                        ptrdiff_t line_size, int h);
-void ff_put_pixels16_mmx(uint8_t *block, const uint8_t *pixels,
-                         ptrdiff_t line_size, int h);
-void ff_avg_pixels8_mmxext(uint8_t *block, const uint8_t *pixels,
-                           ptrdiff_t line_size, int h);
-void ff_put_pixels8_mmxext(uint8_t *block, const uint8_t *pixels,
-                           ptrdiff_t line_size, int h);
-void ff_avg_pixels16_sse2(uint8_t *block, const uint8_t *pixels,
-                          ptrdiff_t line_size, int h);
-void ff_put_pixels16_sse2(uint8_t *block, const uint8_t *pixels,
-                          ptrdiff_t line_size, int h);
-
 void ff_avg_pixels8_x2_mmx(uint8_t *block, const uint8_t *pixels,
                            ptrdiff_t line_size, int h);
 
diff --git a/libavcodec/x86/fpel.h b/libavcodec/x86/fpel.h
new file mode 100644 (file)
index 0000000..2fbbfce
--- /dev/null
@@ -0,0 +1,43 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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.
+ *
+ * FFmpeg 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_X86_FPEL_H
+#define AVCODEC_X86_FPEL_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+void ff_avg_pixels8_mmx(uint8_t *block, const uint8_t *pixels,
+                        ptrdiff_t line_size, int h);
+void ff_avg_pixels8_mmxext(uint8_t *block, const uint8_t *pixels,
+                           ptrdiff_t line_size, int h);
+void ff_avg_pixels16_mmx(uint8_t *block, const uint8_t *pixels,
+                         ptrdiff_t line_size, int h);
+void ff_avg_pixels16_sse2(uint8_t *block, const uint8_t *pixels,
+                          ptrdiff_t line_size, int h);
+void ff_put_pixels8_mmx(uint8_t *block, const uint8_t *pixels,
+                        ptrdiff_t line_size, int h);
+void ff_put_pixels8_mmxext(uint8_t *block, const uint8_t *pixels,
+                           ptrdiff_t line_size, int h);
+void ff_put_pixels16_mmx(uint8_t *block, const uint8_t *pixels,
+                         ptrdiff_t line_size, int h);
+void ff_put_pixels16_sse2(uint8_t *block, const uint8_t *pixels,
+                          ptrdiff_t line_size, int h);
+
+
+#endif /* AVCODEC_X86_FPEL_H */
index 885cb4f..45cc57e 100644 (file)
@@ -25,7 +25,7 @@
 #include <stdint.h>
 
 #include "config.h"
-#include "dsputil_x86.h"
+#include "fpel.h"
 #include "inline_asm.h"
 
 #if HAVE_MMX_INLINE
index 3422fd1..a051b12 100644 (file)
@@ -26,7 +26,7 @@
 #include "libavcodec/h264qpel.h"
 #include "libavcodec/mpegvideo.h"
 #include "libavcodec/pixels.h"
-#include "dsputil_x86.h"
+#include "fpel.h"
 
 #if HAVE_YASM
 void ff_put_pixels4_mmxext(uint8_t *block, const uint8_t *pixels,
index 492cc47..3c9515a 100644 (file)
@@ -30,6 +30,7 @@
 #include "libavcodec/hpeldsp.h"
 #include "libavcodec/pixels.h"
 #include "dsputil_x86.h"
+#include "fpel.h"
 
 void ff_put_pixels8_x2_mmxext(uint8_t *block, const uint8_t *pixels,
                               ptrdiff_t line_size, int h);
index 9bd5ae3..aff4b26 100644 (file)
@@ -28,7 +28,7 @@
 #include "libavutil/cpu.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/vc1dsp.h"
-#include "dsputil_x86.h"
+#include "fpel.h"
 #include "vc1dsp.h"
 #include "config.h"
 
index 942aa42..5b71de3 100644 (file)
@@ -30,7 +30,7 @@
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/vc1dsp.h"
 #include "constants.h"
-#include "dsputil_x86.h"
+#include "fpel.h"
 #include "vc1dsp.h"
 
 #if HAVE_INLINE_ASM