[FFmpeg-cvslog] Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  6 13:27:24 2013 +0100| [6c3888487686a2e6cd505cb60d58106954e3569b] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6c3888487686a2e6cd505cb60d58106954e3569b
---