Merge commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 May 2013 11:00:21 +0000 (13:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 May 2013 11:00:21 +0000 (13:00 +0200)
* commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70':
  swscale: Add av_cold attributes to init functions missing them

Conflicts:
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libswscale/rgb2rgb_template.c
libswscale/utils.c
libswscale/x86/rgb2rgb_template.c

Simple merge
@@@ -241,11 -208,12 +241,12 @@@ static double getSplineCoeff(double a, 
                                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 is_horizontal)
++                              double param[2])
  {
      int i;
      int filterSize;
Simple merge