diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 15:00:21 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 15:00:21 +0400 |
| commit | d5dbd84c9ab63c2852103f5b6189cc7e53e797c9 (patch) | |
| tree | ed7d009f7abf7f42a9b7c24097ad20369ae06fb4 /libswscale | |
| parent | 3c200aa6930dfafdc4abacc49084503fa09dbbf8 (diff) | |
| parent | 2b677ffca54a5fbef9c8860841c32f28ecd68f70 (diff) | |
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')
| -rw-r--r-- | libswscale/rgb2rgb_template.c | 4 | ||||
| -rw-r--r-- | libswscale/utils.c | 17 | ||||
| -rw-r--r-- | libswscale/x86/rgb2rgb_template.c | 4 |
3 files changed, 15 insertions, 10 deletions
diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c index 76229d8600..545c59add8 100644 --- a/libswscale/rgb2rgb_template.c +++ b/libswscale/rgb2rgb_template.c @@ -26,6 +26,8 @@ #include <stddef.h> +#include "libavutil/attributes.h" + static inline void rgb24tobgr32_c(const uint8_t *src, uint8_t *dst, int src_size) { @@ -892,7 +894,7 @@ static void uyvytoyuv422_c(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, } } -static inline void rgb2rgb_init_c(void) +static av_cold void rgb2rgb_init_c(void) { rgb15to16 = rgb15to16_c; rgb15tobgr24 = rgb15tobgr24_c; diff --git a/libswscale/utils.c b/libswscale/utils.c index 9badd0b085..1ce9576cb2 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -241,11 +241,12 @@ static double getSplineCoeff(double a, double b, double c, double d, dist - 1.0); } -static int initFilter(int16_t **outFilter, int32_t **filterPos, - int *outFilterSize, int xInc, int srcW, int dstW, - int filterAlign, int one, int flags, int cpu_flags, - SwsVector *srcFilter, SwsVector *dstFilter, - double param[2]) +static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos, + int *outFilterSize, int xInc, int srcW, + int dstW, int filterAlign, int one, + int flags, int cpu_flags, + SwsVector *srcFilter, SwsVector *dstFilter, + double param[2]) { int i; int filterSize; @@ -632,9 +633,9 @@ fail: } #if HAVE_MMXEXT_INLINE -static int init_hscaler_mmxext(int dstW, int xInc, uint8_t *filterCode, - int16_t *filter, int32_t *filterPos, - int numSplits) +static av_cold int init_hscaler_mmxext(int dstW, int xInc, uint8_t *filterCode, + int16_t *filter, int32_t *filterPos, + int numSplits) { uint8_t *fragmentA; x86_reg imm8OfPShufW1A; 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 |