Skip to content
Snippets Groups Projects
Commit d5dbd84c authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '2b677ffc' 


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

Conflicts:
	libswscale/utils.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 3c200aa6 2b677ffc
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment