aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-08-20 18:24:27 +0200
committerDiego Biurrun <diego@biurrun.de>2013-08-29 11:24:14 +0200
commit67e6a9f558fbf7a72137abd0034a3f11249ab8bb (patch)
tree482ae485e8eb1ea303c21e309f50c57b83cd2327
parentf0389eb777b1ab4291329d4f709098cdfa7384dc (diff)
downloadffmpeg-67e6a9f558fbf7a72137abd0034a3f11249ab8bb.tar.gz
cosmetics: Place arch initialization calls in alphabetical order
-rw-r--r--libavcodec/dsputil.c21
-rw-r--r--libavcodec/rv40dsp.c4
-rw-r--r--libavcodec/vc1dsp.c4
-rw-r--r--libavcodec/vorbisdsp.c8
-rw-r--r--libavcodec/vp8dsp.c4
-rw-r--r--libswscale/yuv2rgb.c12
6 files changed, 30 insertions, 23 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index f031b9b7d3..6d93706fb0 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -2745,13 +2745,20 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx)
}
- if (ARCH_X86) ff_dsputil_init_x86 (c, avctx);
- if (ARCH_ARM) ff_dsputil_init_arm (c, avctx);
- if (HAVE_VIS) ff_dsputil_init_vis (c, avctx);
- if (ARCH_ALPHA) ff_dsputil_init_alpha (c, avctx);
- if (ARCH_PPC) ff_dsputil_init_ppc (c, avctx);
- if (ARCH_SH4) ff_dsputil_init_sh4 (c, avctx);
- if (ARCH_BFIN) ff_dsputil_init_bfin (c, avctx);
+ if (ARCH_ALPHA)
+ ff_dsputil_init_alpha(c, avctx);
+ if (ARCH_ARM)
+ ff_dsputil_init_arm(c, avctx);
+ if (ARCH_BFIN)
+ ff_dsputil_init_bfin(c, avctx);
+ if (ARCH_PPC)
+ ff_dsputil_init_ppc(c, avctx);
+ if (ARCH_SH4)
+ ff_dsputil_init_sh4(c, avctx);
+ if (HAVE_VIS)
+ ff_dsputil_init_vis(c, avctx);
+ if (ARCH_X86)
+ ff_dsputil_init_x86(c, avctx);
ff_init_scantable_permutation(c->idct_permutation,
c->idct_permutation_type);
diff --git a/libavcodec/rv40dsp.c b/libavcodec/rv40dsp.c
index b63d238662..a7af1d6d8e 100644
--- a/libavcodec/rv40dsp.c
+++ b/libavcodec/rv40dsp.c
@@ -618,8 +618,8 @@ av_cold void ff_rv40dsp_init(RV34DSPContext *c)
c->rv40_loop_filter_strength[0] = rv40_h_loop_filter_strength;
c->rv40_loop_filter_strength[1] = rv40_v_loop_filter_strength;
- if (ARCH_X86)
- ff_rv40dsp_init_x86(c);
if (ARCH_ARM)
ff_rv40dsp_init_arm(c);
+ if (ARCH_X86)
+ ff_rv40dsp_init_x86(c);
}
diff --git a/libavcodec/vc1dsp.c b/libavcodec/vc1dsp.c
index 9ebea68537..12295fff2b 100644
--- a/libavcodec/vc1dsp.c
+++ b/libavcodec/vc1dsp.c
@@ -854,8 +854,8 @@ av_cold void ff_vc1dsp_init(VC1DSPContext* dsp) {
dsp->sprite_v_double_twoscale = sprite_v_double_twoscale_c;
#endif
- if (ARCH_X86)
- ff_vc1dsp_init_x86(dsp);
if (ARCH_PPC)
ff_vc1dsp_init_ppc(dsp);
+ if (ARCH_X86)
+ ff_vc1dsp_init_x86(dsp);
}
diff --git a/libavcodec/vorbisdsp.c b/libavcodec/vorbisdsp.c
index 34cfe3275a..8e82c10722 100644
--- a/libavcodec/vorbisdsp.c
+++ b/libavcodec/vorbisdsp.c
@@ -25,10 +25,10 @@ av_cold void ff_vorbisdsp_init(VorbisDSPContext *dsp)
{
dsp->vorbis_inverse_coupling = ff_vorbis_inverse_coupling;
- if (ARCH_X86)
- ff_vorbisdsp_init_x86(dsp);
- if (ARCH_PPC)
- ff_vorbisdsp_init_ppc(dsp);
if (ARCH_ARM)
ff_vorbisdsp_init_arm(dsp);
+ if (ARCH_PPC)
+ ff_vorbisdsp_init_ppc(dsp);
+ if (ARCH_X86)
+ ff_vorbisdsp_init_x86(dsp);
}
diff --git a/libavcodec/vp8dsp.c b/libavcodec/vp8dsp.c
index b0e54b6b11..34e2da0c34 100644
--- a/libavcodec/vp8dsp.c
+++ b/libavcodec/vp8dsp.c
@@ -521,10 +521,10 @@ av_cold void ff_vp8dsp_init(VP8DSPContext *dsp)
VP8_BILINEAR_MC_FUNC(1, 8);
VP8_BILINEAR_MC_FUNC(2, 4);
- if (ARCH_X86)
- ff_vp8dsp_init_x86(dsp);
if (ARCH_ARM)
ff_vp8dsp_init_arm(dsp);
if (ARCH_PPC)
ff_vp8dsp_init_ppc(dsp);
+ if (ARCH_X86)
+ ff_vp8dsp_init_x86(dsp);
}
diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c
index 00af4ee836..f939bbebd0 100644
--- a/libswscale/yuv2rgb.c
+++ b/libswscale/yuv2rgb.c
@@ -560,14 +560,14 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c)
{
SwsFunc t = NULL;
- if (ARCH_X86)
- t = ff_yuv2rgb_init_x86(c);
- else if (HAVE_VIS)
- t = ff_yuv2rgb_init_vis(c);
- else if (ARCH_BFIN)
+ if (ARCH_BFIN)
t = ff_yuv2rgb_init_bfin(c);
- else if (ARCH_PPC)
+ if (ARCH_PPC)
t = ff_yuv2rgb_init_ppc(c);
+ if (HAVE_VIS)
+ t = ff_yuv2rgb_init_vis(c);
+ if (ARCH_X86)
+ t = ff_yuv2rgb_init_x86(c);
if (t)
return t;