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/rgb2rgb_template.c | |
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/rgb2rgb_template.c')
-rw-r--r-- | libswscale/rgb2rgb_template.c | 4 |
1 files changed, 3 insertions, 1 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; |