[SCM] libav/experimental: ppc: 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 ae116cd3ed908d28b69d5198712217ec743d74f6
Author: Diego Biurrun <diego at biurrun.de>
Date:   Wed Jan 29 16:06:28 2014 -0800

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

diff --git a/libavcodec/ppc/dsputil_altivec.h b/libavcodec/ppc/dsputil_altivec.h
index 929cb75..7833b4b 100644
--- a/libavcodec/ppc/dsputil_altivec.h
+++ b/libavcodec/ppc/dsputil_altivec.h
@@ -27,11 +27,6 @@
 
 #include "libavcodec/dsputil.h"
 
-void ff_avg_pixels16_altivec(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,
-                             ptrdiff_t line_size, int h);
-
 void ff_fdct_altivec(int16_t *block);
 void ff_gmc1_altivec(uint8_t *dst, uint8_t *src, int stride, int h,
                      int x16, int y16, int rounder);
diff --git a/libavcodec/ppc/h264qpel.c b/libavcodec/ppc/h264qpel.c
index f99c8f8..aae6725 100644
--- a/libavcodec/ppc/h264qpel.c
+++ b/libavcodec/ppc/h264qpel.c
@@ -25,7 +25,7 @@
 #include "libavutil/ppc/types_altivec.h"
 #include "libavutil/ppc/util_altivec.h"
 #include "libavcodec/h264qpel.h"
-#include "dsputil_altivec.h"
+#include "hpeldsp_altivec.h"
 
 #if HAVE_ALTIVEC
 
diff --git a/libavcodec/ppc/hpeldsp_altivec.c b/libavcodec/ppc/hpeldsp_altivec.c
index d40c5d8..92ce52a 100644
--- a/libavcodec/ppc/hpeldsp_altivec.c
+++ b/libavcodec/ppc/hpeldsp_altivec.c
@@ -31,7 +31,7 @@
 #include "libavutil/ppc/types_altivec.h"
 #include "libavutil/ppc/util_altivec.h"
 #include "libavcodec/hpeldsp.h"
-#include "dsputil_altivec.h"
+#include "hpeldsp_altivec.h"
 
 #if HAVE_ALTIVEC
 /* next one assumes that ((line_size % 16) == 0) */
diff --git a/libavcodec/ppc/dsputil_altivec.h b/libavcodec/ppc/hpeldsp_altivec.h
similarity index 64%
copy from libavcodec/ppc/dsputil_altivec.h
copy to libavcodec/ppc/hpeldsp_altivec.h
index 929cb75..98dd80e 100644
--- a/libavcodec/ppc/dsputil_altivec.h
+++ b/libavcodec/ppc/hpeldsp_altivec.h
@@ -20,26 +20,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_PPC_DSPUTIL_ALTIVEC_H
-#define AVCODEC_PPC_DSPUTIL_ALTIVEC_H
+#ifndef AVCODEC_PPC_HPELDSP_ALTIVEC_H
+#define AVCODEC_PPC_HPELDSP_ALTIVEC_H
 
+#include <stddef.h>
 #include <stdint.h>
 
-#include "libavcodec/dsputil.h"
-
 void ff_avg_pixels16_altivec(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,
                              ptrdiff_t line_size, int h);
 
-void ff_fdct_altivec(int16_t *block);
-void ff_gmc1_altivec(uint8_t *dst, uint8_t *src, int stride, int h,
-                     int x16, int y16, int rounder);
-void ff_idct_put_altivec(uint8_t *dest, int line_size, int16_t *block);
-void ff_idct_add_altivec(uint8_t *dest, int line_size, int16_t *block);
-
-void ff_dsputil_init_altivec(DSPContext *c, AVCodecContext *avctx,
-                             unsigned high_bit_depth);
-void ff_int_init_altivec(DSPContext *c, AVCodecContext *avctx);
-
-#endif /* AVCODEC_PPC_DSPUTIL_ALTIVEC_H */
+#endif /* AVCODEC_PPC_HPELDSP_ALTIVEC_H */
diff --git a/libavcodec/ppc/vp8dsp_altivec.c b/libavcodec/ppc/vp8dsp_altivec.c
index 2e6d0fa..366dc3c 100644
--- a/libavcodec/ppc/vp8dsp_altivec.c
+++ b/libavcodec/ppc/vp8dsp_altivec.c
@@ -26,7 +26,7 @@
 #include "libavutil/ppc/types_altivec.h"
 #include "libavutil/ppc/util_altivec.h"
 #include "libavcodec/vp8dsp.h"
-#include "dsputil_altivec.h"
+#include "hpeldsp_altivec.h"
 
 #if HAVE_ALTIVEC
 #define REPT4(...) { __VA_ARGS__, __VA_ARGS__, __VA_ARGS__, __VA_ARGS__ }

-- 
Libav/FFmpeg packaging