Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 12:27:24 +0000 (13:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 12:27:24 +0000 (13:27 +0100)
commit6c3888487686a2e6cd505cb60d58106954e3569b
treefed5222c8da1b4957ad67cdcbdf878ee7370a07c
parent0ddca7d416cc8b80d9943405d6d0bb39bc2dec06
parent620289a20e022b9c16c10d546ef86cc0bb77cc84
Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

* commit '620289a20e022b9c16c10d546ef86cc0bb77cc84':
  sh4: Fix silly type vs. variable name search and replace typo
  configure: Group all hwaccels together in a separate variable
  Add av_cold attributes to arch-specific init functions

Conflicts:
configure
libavcodec/arm/mpegvideo_armv5te.c
libavcodec/x86/mlpdsp.c
libavcodec/x86/motion_est.c
libavcodec/x86/mpegvideoenc.c
libavcodec/x86/videodsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
52 files changed:
configure
libavcodec/alpha/dsputil_alpha.c
libavcodec/alpha/mpegvideo_alpha.c
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/fmtconvert_init_arm.c
libavcodec/arm/h264dsp_init_arm.c
libavcodec/arm/h264pred_init_arm.c
libavcodec/arm/h264qpel_init_arm.c
libavcodec/arm/mpegvideo_arm.c
libavcodec/arm/mpegvideo_armv5te.c
libavcodec/arm/rv34dsp_init_arm.c
libavcodec/arm/rv40dsp_init_arm.c
libavcodec/arm/videodsp_init_arm.c
libavcodec/arm/videodsp_init_armv5te.c
libavcodec/arm/vorbisdsp_init_arm.c
libavcodec/arm/vp56dsp_init_arm.c
libavcodec/bfin/dsputil_bfin.c
libavcodec/bfin/mpegvideo_bfin.c
libavcodec/bfin/vp3_bfin.c
libavcodec/ppc/dsputil_altivec.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/ppc/fmtconvert_altivec.c
libavcodec/ppc/h264_altivec.c
libavcodec/ppc/h264_qpel.c
libavcodec/ppc/int_altivec.c
libavcodec/ppc/mpegaudiodec_altivec.c
libavcodec/ppc/mpegvideo_altivec.c
libavcodec/ppc/vc1dsp_altivec.c
libavcodec/ppc/videodsp_ppc.c
libavcodec/ppc/vorbisdsp_altivec.c
libavcodec/sh4/dsputil_align.c
libavcodec/sh4/dsputil_sh4.c
libavcodec/sparc/dsputil_vis.c
libavcodec/x86/cavsdsp.c
libavcodec/x86/dnxhdenc.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/fmtconvert_init.c
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/h264_qpel.c
libavcodec/x86/h264dsp_init.c
libavcodec/x86/lpc.c
libavcodec/x86/mlpdsp.c
libavcodec/x86/motion_est.c
libavcodec/x86/mpegaudiodec.c
libavcodec/x86/mpegvideo.c
libavcodec/x86/mpegvideoenc.c
libavcodec/x86/pngdsp_init.c
libavcodec/x86/rv40dsp_init.c
libavcodec/x86/videodsp_init.c
libavcodec/x86/vorbisdsp_init.c