---

Now adding declarations to headers on the ARM side.

 libavcodec/arm/dsputil_init_arm.c |    5 ++---
 libavcodec/dct-test.c             |   16 ++--------------
 libavcodec/dct.h                  |    1 +
 libavcodec/simple_idct.h          |    5 +++++
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/libavcodec/arm/dsputil_init_arm.c 
b/libavcodec/arm/dsputil_init_arm.c
index bb68eb6..520ac59 100644
--- a/libavcodec/arm/dsputil_init_arm.c
+++ b/libavcodec/arm/dsputil_init_arm.c
@@ -21,11 +21,10 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/arm/cpu.h"
+#include "libavcodec/dct.h"
+#include "libavcodec/simple_idct.h"
 #include "dsputil_arm.h"
 
-void ff_j_rev_dct_arm(int16_t *data);
-void ff_simple_idct_arm(int16_t *data);
-
 /* XXX: local hack */
 static void (*ff_put_pixels_clamped)(const int16_t *block, uint8_t *pixels, 
int line_size);
 static void (*ff_add_pixels_clamped)(const int16_t *block, uint8_t *pixels, 
int line_size);
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c
index d71f7a3..94fa0af 100644
--- a/libavcodec/dct-test.c
+++ b/libavcodec/dct-test.c
@@ -44,23 +44,11 @@
 #include "aandcttab.h"
 #include "faandct.h"
 #include "faanidct.h"
+#include "bfin/dsputil_bfin.h"
+#include "ppc/dsputil_altivec.h"
 #include "x86/idct_xvid.h"
 #include "dctref.h"
 
-// BFIN
-void ff_bfin_idct(int16_t *block);
-void ff_bfin_fdct(int16_t *block);
-
-// ALTIVEC
-void ff_fdct_altivec(int16_t *block);
-
-// ARM
-void ff_j_rev_dct_arm(int16_t *data);
-void ff_simple_idct_arm(int16_t *data);
-void ff_simple_idct_armv5te(int16_t *data);
-void ff_simple_idct_armv6(int16_t *data);
-void ff_simple_idct_neon(int16_t *data);
-
 struct algo {
     const char *name;
     void (*func)(int16_t *block);
diff --git a/libavcodec/dct.h b/libavcodec/dct.h
index 3de10b9..b69b9b1 100644
--- a/libavcodec/dct.h
+++ b/libavcodec/dct.h
@@ -59,6 +59,7 @@ void ff_fdct248_islow_8(int16_t *data);
 void ff_fdct248_islow_10(int16_t *data);
 
 void ff_j_rev_dct(int16_t *data);
+void ff_j_rev_dct_arm(int16_t *data);
 
 void ff_fdct_mmx(int16_t *block);
 void ff_fdct_mmxext(int16_t *block);
diff --git a/libavcodec/simple_idct.h b/libavcodec/simple_idct.h
index e257290..563744d 100644
--- a/libavcodec/simple_idct.h
+++ b/libavcodec/simple_idct.h
@@ -48,6 +48,11 @@ void ff_simple_idct_mmx(int16_t *block);
 void ff_simple_idct_add_mmx(uint8_t *dest, int line_size, int16_t *block);
 void ff_simple_idct_put_mmx(uint8_t *dest, int line_size, int16_t *block);
 
+void ff_simple_idct_arm(int16_t *data);
+void ff_simple_idct_armv5te(int16_t *data);
+void ff_simple_idct_armv6(int16_t *data);
+void ff_simple_idct_neon(int16_t *data);
+
 void ff_simple_idct248_put(uint8_t *dest, int line_size, int16_t *block);
 
 void ff_simple_idct84_add(uint8_t *dest, int line_size, int16_t *block);
-- 
1.7.9.5

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to