RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  cosmetics: Place arch initialization calls in alphabetical order

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-29 16:15:50 +02:00
parent e1c3e6277f 67e6a9f558
commit f896f92337
6 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/dsputil.c
View File

@ -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_ALPHA)
if (ARCH_ARM) ff_dsputil_init_arm (c, avctx); ff_dsputil_init_alpha(c, avctx);
if (HAVE_VIS) ff_dsputil_init_vis (c, avctx); if (ARCH_ARM)
if (ARCH_ALPHA) ff_dsputil_init_alpha (c, avctx); ff_dsputil_init_arm(c, avctx);
if (ARCH_PPC) ff_dsputil_init_ppc (c, avctx); if (ARCH_BFIN)
if (ARCH_SH4) ff_dsputil_init_sh4 (c, avctx); ff_dsputil_init_bfin(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, ff_init_scantable_permutation(c->idct_permutation,
c->idct_permutation_type); c->idct_permutation_type);

4
libavcodec/rv40dsp.c
View File

@ -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[0] = rv40_h_loop_filter_strength;
c->rv40_loop_filter_strength[1] = rv40_v_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) if (ARCH_ARM)
ff_rv40dsp_init_arm(c); ff_rv40dsp_init_arm(c);
if (ARCH_X86)
ff_rv40dsp_init_x86(c);
} }

4
libavcodec/vc1dsp.c
View File

@ -888,8 +888,8 @@ av_cold void ff_vc1dsp_init(VC1DSPContext* dsp) {
dsp->sprite_v_double_twoscale = sprite_v_double_twoscale_c; dsp->sprite_v_double_twoscale = sprite_v_double_twoscale_c;
#endif #endif
if (ARCH_X86)
ff_vc1dsp_init_x86(dsp);
if (ARCH_PPC) if (ARCH_PPC)
ff_vc1dsp_init_ppc(dsp); ff_vc1dsp_init_ppc(dsp);
if (ARCH_X86)
ff_vc1dsp_init_x86(dsp);
} }

8
libavcodec/vorbisdsp.c
View File

@ -25,10 +25,10 @@ av_cold void ff_vorbisdsp_init(VorbisDSPContext *dsp)
{ {
dsp->vorbis_inverse_coupling = ff_vorbis_inverse_coupling; 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) if (ARCH_ARM)
ff_vorbisdsp_init_arm(dsp); ff_vorbisdsp_init_arm(dsp);
if (ARCH_PPC)
ff_vorbisdsp_init_ppc(dsp);
if (ARCH_X86)
ff_vorbisdsp_init_x86(dsp);
} }

4
libavcodec/vp8dsp.c
View File

@ -521,10 +521,10 @@ av_cold void ff_vp8dsp_init(VP8DSPContext *dsp)
VP8_BILINEAR_MC_FUNC(1, 8); VP8_BILINEAR_MC_FUNC(1, 8);
VP8_BILINEAR_MC_FUNC(2, 4); VP8_BILINEAR_MC_FUNC(2, 4);
if (ARCH_X86)
ff_vp8dsp_init_x86(dsp);
if (ARCH_ARM) if (ARCH_ARM)
ff_vp8dsp_init_arm(dsp); ff_vp8dsp_init_arm(dsp);
if (ARCH_PPC) if (ARCH_PPC)
ff_vp8dsp_init_ppc(dsp); ff_vp8dsp_init_ppc(dsp);
if (ARCH_X86)
ff_vp8dsp_init_x86(dsp);
} }

12
libswscale/yuv2rgb.c
View File

@ -601,14 +601,14 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c)
{ {
SwsFunc t = NULL; SwsFunc t = NULL;
if (ARCH_BFIN)
t = ff_yuv2rgb_init_bfin(c);
if (ARCH_PPC)
t = ff_yuv2rgb_init_ppc(c);
if (HAVE_VIS)
t = ff_yuv2rgb_init_vis(c);
if (ARCH_X86) if (ARCH_X86)
t = ff_yuv2rgb_init_x86(c); t = ff_yuv2rgb_init_x86(c);
else if (HAVE_VIS)
t = ff_yuv2rgb_init_vis(c);
else if (ARCH_BFIN)
t = ff_yuv2rgb_init_bfin(c);
else if (ARCH_PPC)
t = ff_yuv2rgb_init_ppc(c);
if (t) if (t)
return t; return t;