[SCM] libav/experimental: ARM: clean up file/function naming conventions
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:52:33 UTC 2013
The following commit has been merged in the experimental branch:
commit 701c618f7dac12e14a70a390c62cfeb71e33bab2
Author: Måns Rullgård <mans at mansr.com>
Date: Sun Oct 4 13:13:02 2009 +0000
ARM: clean up file/function naming conventions
Originally committed as revision 20164 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index e1271cd..5666494 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -480,8 +480,8 @@ OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \
alpha/mpegvideo_alpha.o \
alpha/simple_idct_alpha.o \
-OBJS-$(ARCH_ARM) += arm/dsputil_arm.o \
- arm/dsputil_arm_s.o \
+OBJS-$(ARCH_ARM) += arm/dsputil_init_arm.o \
+ arm/dsputil_arm.o \
arm/fft_init_arm.o \
arm/jrevdct_arm.o \
arm/mpegvideo_arm.o \
@@ -496,7 +496,7 @@ OBJS-$(HAVE_ARMV6) += arm/dsputil_init_armv6.o \
arm/simple_idct_armv6.o \
OBJS-$(HAVE_ARMVFP) += arm/dsputil_vfp.o \
- arm/float_arm_vfp.o \
+ arm/dsputil_init_vfp.o \
OBJS-$(HAVE_IWMMXT) += arm/dsputil_iwmmxt.o \
arm/mpegvideo_iwmmxt.o \
@@ -510,8 +510,8 @@ NEON-OBJS-$(CONFIG_H264_DECODER) += arm/h264dsp_neon.o \
NEON-OBJS-$(CONFIG_VP3_DECODER) += arm/vp3dsp_neon.o
-OBJS-$(HAVE_NEON) += arm/dsputil_neon.o \
- arm/dsputil_neon_s.o \
+OBJS-$(HAVE_NEON) += arm/dsputil_init_neon.o \
+ arm/dsputil_neon.o \
arm/simple_idct_neon.o \
$(NEON-OBJS-yes)
diff --git a/libavcodec/arm/dsputil_arm_s.S b/libavcodec/arm/dsputil_arm.S
similarity index 100%
rename from libavcodec/arm/dsputil_arm_s.S
rename to libavcodec/arm/dsputil_arm.S
diff --git a/libavcodec/arm/dsputil_arm.h b/libavcodec/arm/dsputil_arm.h
index 4227820..18c46fc 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
similarity index 99%
rename from libavcodec/arm/dsputil_arm.c
rename to libavcodec/arm/dsputil_init_arm.c
index 2b47d07..c9fc12c 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
similarity index 100%
rename from libavcodec/arm/dsputil_neon.c
rename to libavcodec/arm/dsputil_init_neon.c
diff --git a/libavcodec/arm/float_arm_vfp.c b/libavcodec/arm/dsputil_init_vfp.c
similarity index 95%
rename from libavcodec/arm/float_arm_vfp.c
rename to libavcodec/arm/dsputil_init_vfp.c
index d99f089..9f8c1b7 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
similarity index 100%
rename from libavcodec/arm/dsputil_neon_s.S
rename to libavcodec/arm/dsputil_neon.S
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list