
* commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70': swscale: Add av_cold attributes to init functions missing them Conflicts: libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70': swscale: Add av_cold attributes to init functions missing them Conflicts: libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>