summaryrefslogtreecommitdiff
path: root/libavcodec/arm
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2009-10-04 13:13:02 +0000
committerMåns Rullgård <mans@mansr.com>2009-10-04 13:13:02 +0000
commit701c618f7dac12e14a70a390c62cfeb71e33bab2 (patch)
tree4111360fcccc22b556f919de2051652300c1fb0a /libavcodec/arm
parent84d430f85a10cfbca196c686ee59c72dff558ca1 (diff)
ARM: clean up file/function naming conventions
Originally committed as revision 20164 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/arm')
-rw-r--r--libavcodec/arm/dsputil_arm.S (renamed from libavcodec/arm/dsputil_arm_s.S)0
-rw-r--r--libavcodec/arm/dsputil_arm.h2
-rw-r--r--libavcodec/arm/dsputil_init_arm.c (renamed from libavcodec/arm/dsputil_arm.c)2
-rw-r--r--libavcodec/arm/dsputil_init_neon.c (renamed from libavcodec/arm/dsputil_neon.c)0
-rw-r--r--libavcodec/arm/dsputil_init_vfp.c (renamed from libavcodec/arm/float_arm_vfp.c)2
-rw-r--r--libavcodec/arm/dsputil_neon.S (renamed from libavcodec/arm/dsputil_neon_s.S)0
6 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/arm/dsputil_arm_s.S b/libavcodec/arm/dsputil_arm.S
index f6ed454fee..f6ed454fee 100644
--- a/libavcodec/arm/dsputil_arm_s.S
+++ b/libavcodec/arm/dsputil_arm.S
diff --git a/libavcodec/arm/dsputil_arm.h b/libavcodec/arm/dsputil_arm.h
index 4227820f3e..18c46fca35 100644
--- a/libavcodec/arm/dsputil_arm.h
+++ b/libavcodec/arm/dsputil_arm.h
@@ -23,7 +23,7 @@
void ff_dsputil_init_armv5te(DSPContext* c, AVCodecContext *avctx);
void ff_dsputil_init_armv6(DSPContext* c, AVCodecContext *avctx);
-void ff_float_init_arm_vfp(DSPContext* c, AVCodecContext *avctx);
+void ff_dsputil_init_vfp(DSPContext* c, AVCodecContext *avctx);
void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx);
void dsputil_init_iwmmxt(DSPContext* c, AVCodecContext *avctx);
diff --git a/libavcodec/arm/dsputil_arm.c b/libavcodec/arm/dsputil_init_arm.c
index 2b47d07f24..c9fc12c146 100644
--- a/libavcodec/arm/dsputil_arm.c
+++ b/libavcodec/arm/dsputil_init_arm.c
@@ -122,7 +122,7 @@ void dsputil_init_arm(DSPContext* c, AVCodecContext *avctx)
dsputil_init_iwmmxt(c, avctx);
#endif
#if HAVE_ARMVFP
- ff_float_init_arm_vfp(c, avctx);
+ ff_dsputil_init_vfp(c, avctx);
#endif
#if HAVE_NEON
ff_dsputil_init_neon(c, avctx);
diff --git a/libavcodec/arm/dsputil_neon.c b/libavcodec/arm/dsputil_init_neon.c
index 61efdf1979..61efdf1979 100644
--- a/libavcodec/arm/dsputil_neon.c
+++ b/libavcodec/arm/dsputil_init_neon.c
diff --git a/libavcodec/arm/float_arm_vfp.c b/libavcodec/arm/dsputil_init_vfp.c
index d99f089f8a..9f8c1b7840 100644
--- a/libavcodec/arm/float_arm_vfp.c
+++ b/libavcodec/arm/dsputil_init_vfp.c
@@ -26,7 +26,7 @@ void ff_vector_fmul_reverse_vfp(float *dst, const float *src0,
const float *src1, int len);
void ff_float_to_int16_vfp(int16_t *dst, const float *src, long len);
-void ff_float_init_arm_vfp(DSPContext* c, AVCodecContext *avctx)
+void ff_dsputil_init_vfp(DSPContext* c, AVCodecContext *avctx)
{
c->vector_fmul = ff_vector_fmul_vfp;
c->vector_fmul_reverse = ff_vector_fmul_reverse_vfp;
diff --git a/libavcodec/arm/dsputil_neon_s.S b/libavcodec/arm/dsputil_neon.S
index 56e7cd3e96..56e7cd3e96 100644
--- a/libavcodec/arm/dsputil_neon_s.S
+++ b/libavcodec/arm/dsputil_neon.S