Merge commit 'ee80cf741a44115758e62399b7bde08d33161151'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 09:20:20 +0000 (10:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 09:20:20 +0000 (10:20 +0100)
* commit 'ee80cf741a44115758e62399b7bde08d33161151':
  avfilter: x86: K&R formatting cosmetics

Conflicts:
libavfilter/x86/vf_gradfun_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/x86/vf_gradfun_init.c
libavfilter/x86/vf_hqdn3d_init.c

  #include "libavutil/x86/cpu.h"
  #include "libavfilter/gradfun.h"
  
- #if HAVE_YASM
 -void ff_gradfun_filter_line_mmxext(intptr_t x, uint8_t *dst, uint8_t *src,
 -                                   uint16_t *dc, int thresh,
 +void ff_gradfun_filter_line_mmxext(intptr_t x, uint8_t *dst, const uint8_t *src,
 +                                   const uint16_t *dc, int thresh,
                                     const uint16_t *dithers);
 -
 -void ff_gradfun_filter_line_ssse3(intptr_t x, uint8_t *dst, uint8_t *src,
 -                                  uint16_t *dc, int thresh,
++void ff_gradfun_filter_line_ssse3(intptr_t x, uint8_t *dst, const uint8_t *src,
++                                  const uint16_t *dc, int thresh,
+                                   const uint16_t *dithers);
+ void ff_gradfun_blur_line_movdqa_sse2(intptr_t x, uint16_t *buf,
 -                                      uint16_t *buf1, uint16_t *dc,
 -                                      uint8_t *src1, uint8_t *src2);
++                                      const uint16_t *buf1, uint16_t *dc,
++                                      const uint8_t *src1, const uint8_t *src2);
+ void ff_gradfun_blur_line_movdqu_sse2(intptr_t x, uint16_t *buf,
 -                                      uint16_t *buf1, uint16_t *dc,
 -                                      uint8_t *src1, uint8_t *src2);
++                                      const uint16_t *buf1, uint16_t *dc,
++                                      const uint8_t *src1, const uint8_t *src2);
+ #if HAVE_YASM
 -static void gradfun_filter_line_mmxext(uint8_t *dst, uint8_t *src, uint16_t *dc,
 +static void gradfun_filter_line_mmxext(uint8_t *dst, const uint8_t *src,
 +                                       const uint16_t *dc,
                                         int width, int thresh,
                                         const uint16_t *dithers)
  {
                                    thresh, dithers);
  }
  
- void ff_gradfun_filter_line_ssse3(intptr_t x, uint8_t *dst, const uint8_t *src,
-                                   const uint16_t *dc, int thresh,
-                                   const uint16_t *dithers);
- static void gradfun_filter_line_ssse3(uint8_t *dst, const uint8_t *src, const uint16_t *dc, int width, int thresh, const uint16_t *dithers)
 -static void gradfun_filter_line_ssse3(uint8_t *dst, uint8_t *src, uint16_t *dc,
++static void gradfun_filter_line_ssse3(uint8_t *dst, const uint8_t *src, const uint16_t *dc,
+                                       int width, int thresh,
+                                       const uint16_t *dithers)
  {
      intptr_t x;
      if (width & 7) {
                                   thresh, dithers);
  }
  
- void ff_gradfun_blur_line_movdqa_sse2(intptr_t x, uint16_t *buf, const uint16_t *buf1, uint16_t *dc, const uint8_t *src1, const uint8_t *src2);
- void ff_gradfun_blur_line_movdqu_sse2(intptr_t x, uint16_t *buf, const uint16_t *buf1, uint16_t *dc, const uint8_t *src1, const uint8_t *src2);
- static void gradfun_blur_line_sse2(uint16_t *dc, uint16_t *buf, const uint16_t *buf1, const uint8_t *src, int src_linesize, int width)
 -static void gradfun_blur_line_sse2(uint16_t *dc, uint16_t *buf, uint16_t *buf1,
 -                                   uint8_t *src, int src_linesize, int width)
++static void gradfun_blur_line_sse2(uint16_t *dc, uint16_t *buf, const uint16_t *buf1,
++                                   const uint8_t *src, int src_linesize, int width)
  {
-     intptr_t x = -2*width;
-     if (((intptr_t) src | src_linesize) & 15) {
+     intptr_t x = -2 * width;
+     if (((intptr_t) src | src_linesize) & 15)
          ff_gradfun_blur_line_movdqu_sse2(x, buf + width, buf1 + width,
                                           dc + width, src + width * 2,
                                           src + width * 2 + src_linesize);
Simple merge