diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 18:15:50 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 18:15:54 +0400 |
commit | f896f92337e71cc7dd3d4d2c37c8b04435e37d15 (patch) | |
tree | 8a2c51883ffef3d25214de87dafb22d4dc4f501e /libavcodec | |
parent | e1c3e6277f095a258a3676263202a595c044f57b (diff) | |
parent | 67e6a9f558fbf7a72137abd0034a3f11249ab8bb (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cosmetics: Place arch initialization calls in alphabetical order
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/dsputil.c | 21 | ||||
-rw-r--r-- | libavcodec/rv40dsp.c | 4 | ||||
-rw-r--r-- | libavcodec/vc1dsp.c | 4 | ||||
-rw-r--r-- | libavcodec/vorbisdsp.c | 8 | ||||
-rw-r--r-- | libavcodec/vp8dsp.c | 4 |
5 files changed, 24 insertions, 17 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index fe2df12c49..0161347cc4 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2915,13 +2915,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 ad985f87c6..bdd9a3e3e6 100644 --- a/libavcodec/rv40dsp.c +++ b/libavcodec/rv40dsp.c @@ -619,8 +619,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 39e94418fa..aab9d1aa6d 100644 --- a/libavcodec/vc1dsp.c +++ b/libavcodec/vc1dsp.c @@ -888,8 +888,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 5842cfd1da..784375697e 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 39d8038155..3ead24e613 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); } |