diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 13:00:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 13:00:21 +0200 |
| commit | d5dbd84c9ab63c2852103f5b6189cc7e53e797c9 (patch) | |
| tree | ed7d009f7abf7f42a9b7c24097ad20369ae06fb4 /libswscale/x86 | |
| parent | 3c200aa6930dfafdc4abacc49084503fa09dbbf8 (diff) | |
| parent | 2b677ffca54a5fbef9c8860841c32f28ecd68f70 (diff) | |
| download | ffmpeg-d5dbd84c9ab63c2852103f5b6189cc7e53e797c9.tar.gz | |
Merge commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70'
* commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70':
swscale: Add av_cold attributes to init functions missing them
Conflicts:
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/x86')
| -rw-r--r-- | libswscale/x86/rgb2rgb_template.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c index fd5b4b9c7d..26f0ddc0b5 100644 --- a/libswscale/x86/rgb2rgb_template.c +++ b/libswscale/x86/rgb2rgb_template.c @@ -26,6 +26,8 @@ #include <stddef.h> +#include "libavutil/attributes.h" + #undef PREFETCH #undef MOVNTQ #undef EMMS @@ -2448,7 +2450,7 @@ static void RENAME(uyvytoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, co #endif /* !COMPILE_TEMPLATE_AMD3DNOW */ #endif /* !COMPILE_TEMPLATE_SSE2 */ -static inline void RENAME(rgb2rgb_init)(void) +static av_cold void RENAME(rgb2rgb_init)(void) { #if !COMPILE_TEMPLATE_SSE2 #if !COMPILE_TEMPLATE_AMD3DNOW |