har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70'

Browse Source 
* commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70':
  swscale: Add av_cold attributes to init functions missing them

Conflicts:
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-05 13:00:21 +02:00
commit d5dbd84c9a
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libswscale/rgb2rgb_template.c
View File

@ -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;

17
libswscale/utils.c
View File

@ -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;

4
libswscale/x86/rgb2rgb_template.c
View File

@ -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