[SCM] libav/experimental: x86: dsputil: Move hpeldsp-related declarations to a separate header

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 82dd1026cfc1d72b04019185bea4c1c9621ace3f
Author: Diego Biurrun <diego at biurrun.de>
Date:   Wed Jan 29 14:57:10 2014 +0100

    x86: dsputil: Move hpeldsp-related declarations to a separate header

diff --git a/libavcodec/x86/dsputil_x86.h b/libavcodec/x86/dsputil_x86.h
index 9fd34fc..5f6aca4 100644
--- a/libavcodec/x86/dsputil_x86.h
+++ b/libavcodec/x86/dsputil_x86.h
@@ -22,7 +22,6 @@
 #ifndef AVCODEC_X86_DSPUTIL_X86_H
 #define AVCODEC_X86_DSPUTIL_X86_H
 
-#include <stddef.h>
 #include <stdint.h>
 
 #include "libavcodec/avcodec.h"
@@ -61,17 +60,4 @@ void ff_gmc_mmx(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_x2_mmx(uint8_t *block, const uint8_t *pixels,
-                           ptrdiff_t line_size, int h);
-
-void ff_avg_pixels8_xy2_mmx(uint8_t *block, const uint8_t *pixels,
-                            ptrdiff_t line_size, int h);
-void ff_avg_pixels16_xy2_mmx(uint8_t *block, const uint8_t *pixels,
-                             ptrdiff_t line_size, int h);
-
-void ff_put_pixels8_xy2_mmx(uint8_t *block, const uint8_t *pixels,
-                            ptrdiff_t line_size, int h);
-void ff_put_pixels16_xy2_mmx(uint8_t *block, const uint8_t *pixels,
-                             ptrdiff_t line_size, int h);
-
 #endif /* AVCODEC_X86_DSPUTIL_X86_H */
diff --git a/libavcodec/ppc/hpeldsp_altivec.h b/libavcodec/x86/hpeldsp.h
similarity index 60%
copy from libavcodec/ppc/hpeldsp_altivec.h
copy to libavcodec/x86/hpeldsp.h
index 98dd80e..47b0b8b 100644
--- a/libavcodec/ppc/hpeldsp_altivec.h
+++ b/libavcodec/x86/hpeldsp.h
@@ -1,8 +1,4 @@
 /*
- * Copyright (c) 2002 Brian Foley
- * Copyright (c) 2002 Dieter Shirley
- * Copyright (c) 2003-2004 Romain Dolbeau <romain at dolbeau.org>
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
@@ -20,15 +16,23 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_PPC_HPELDSP_ALTIVEC_H
-#define AVCODEC_PPC_HPELDSP_ALTIVEC_H
+#ifndef AVCODEC_X86_HPELDSP_H
+#define AVCODEC_X86_HPELDSP_H
 
 #include <stddef.h>
 #include <stdint.h>
 
-void ff_avg_pixels16_altivec(uint8_t *block, const uint8_t *pixels,
+void ff_avg_pixels8_x2_mmx(uint8_t *block, const uint8_t *pixels,
+                           ptrdiff_t line_size, int h);
+
+void ff_avg_pixels8_xy2_mmx(uint8_t *block, const uint8_t *pixels,
+                            ptrdiff_t line_size, int h);
+void ff_avg_pixels16_xy2_mmx(uint8_t *block, const uint8_t *pixels,
                              ptrdiff_t line_size, int h);
-void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels,
+
+void ff_put_pixels8_xy2_mmx(uint8_t *block, const uint8_t *pixels,
+                            ptrdiff_t line_size, int h);
+void ff_put_pixels16_xy2_mmx(uint8_t *block, const uint8_t *pixels,
                              ptrdiff_t line_size, int h);
 
-#endif /* AVCODEC_PPC_HPELDSP_ALTIVEC_H */
+#endif /* AVCODEC_X86_HPELDSP_H */
diff --git a/libavcodec/x86/hpeldsp_init.c b/libavcodec/x86/hpeldsp_init.c
index 0603e40..86e41bcb 100644
--- a/libavcodec/x86/hpeldsp_init.c
+++ b/libavcodec/x86/hpeldsp_init.c
@@ -29,8 +29,8 @@
 #include "libavcodec/avcodec.h"
 #include "libavcodec/hpeldsp.h"
 #include "libavcodec/pixels.h"
-#include "dsputil_x86.h"
 #include "fpel.h"
+#include "hpeldsp.h"
 
 void ff_put_pixels8_x2_mmxext(uint8_t *block, const uint8_t *pixels,
                               ptrdiff_t line_size, int h);
diff --git a/libavcodec/x86/hpeldsp_mmx.c b/libavcodec/x86/hpeldsp_mmx.c
index b78a0c8..c93c78e 100644
--- a/libavcodec/x86/hpeldsp_mmx.c
+++ b/libavcodec/x86/hpeldsp_mmx.c
@@ -24,7 +24,7 @@
 #include <stdint.h>
 
 #include "config.h"
-#include "dsputil_x86.h"
+#include "hpeldsp.h"
 #include "inline_asm.h"
 
 #if HAVE_MMX_INLINE
diff --git a/libavcodec/x86/rnd_mmx.c b/libavcodec/x86/rnd_mmx.c
index 720d88f..44718eb 100644
--- a/libavcodec/x86/rnd_mmx.c
+++ b/libavcodec/x86/rnd_mmx.c
@@ -18,7 +18,7 @@
 
 #include "config.h"
 #include "libavcodec/pixels.h"
-#include "dsputil_x86.h"
+#include "hpeldsp.h"
 #include "inline_asm.h"
 
 #if HAVE_INLINE_ASM
diff --git a/libavcodec/x86/rv40dsp_init.c b/libavcodec/x86/rv40dsp_init.c
index 781f467..8fd2729 100644
--- a/libavcodec/x86/rv40dsp_init.c
+++ b/libavcodec/x86/rv40dsp_init.c
@@ -30,7 +30,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/mem.h"
 #include "libavutil/x86/cpu.h"
-#include "dsputil_x86.h"
+#include "hpeldsp.h"
 
 #if HAVE_YASM
 void ff_put_rv40_chroma_mc8_mmx  (uint8_t *dst, uint8_t *src,

-- 
Libav/FFmpeg packaging