generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests 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
parent 3c200aa693 2b677ffca5
commit d5dbd84c9a
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;