[FFmpeg-cvslog] Merge commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May  5 13:00:21 2013 +0200| [d5dbd84c9ab63c2852103f5b6189cc7e53e797c9] | committer: Michael Niedermayer

Merge commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70'

* commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70':
  swscale: Add av_cold attributes to init functions missing them

Conflicts:
	libswscale/utils.c

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

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