[FFmpeg-cvslog] Merge commit '093804a93cc5da3f95f98265a5df116912443cec'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May  5 11:42:18 2013 +0200| [a8ff830b79d05b1c03ae7e2551ff7142e0845cec] | committer: Michael Niedermayer

Merge commit '093804a93cc5da3f95f98265a5df116912443cec'

* commit '093804a93cc5da3f95f98265a5df116912443cec':
  avfilter: Add av_cold attributes to init/uninit functions

Conflicts:
	libavfilter/af_ashowinfo.c
	libavfilter/af_volume.c
	libavfilter/src_movie.c
	libavfilter/vf_lut.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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