Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 21:19:16 +0000 (22:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 21:20:26 +0000 (22:20 +0100)
* qatar/master:
  rgb2rgb_template: add MMX/SSE2/AVX-optimized deinterleaveBytes

Conflicts:
libswscale/x86/rgb2rgb_template.c

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

@@@ -1926,22 -1943,19 +1926,23 @@@ static void RENAME(interleaveBytes)(con
  }
  #endif /* !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX */
  
 +#if !COMPILE_TEMPLATE_AVX || HAVE_AVX_EXTERNAL
  #if !COMPILE_TEMPLATE_AMD3DNOW && (ARCH_X86_32 || COMPILE_TEMPLATE_SSE2) && COMPILE_TEMPLATE_MMXEXT == COMPILE_TEMPLATE_SSE2 && HAVE_YASM
  void RENAME(ff_nv12ToUV)(uint8_t *dstU, uint8_t *dstV,
-                                 const uint8_t *unused0,
-                                 const uint8_t *src1,
-                                 const uint8_t *src2,
-                                 int w, uint32_t *unused);
 -                         const uint8_t *src, const uint8_t *unused, int w,
++                         const uint8_t *unused,
++                         const uint8_t *src1,
++                         const uint8_t *src2,
++                         int w,
+                          uint32_t *unused2);
  static void RENAME(deinterleaveBytes)(const uint8_t *src, uint8_t *dst1, uint8_t *dst2,
                                        int width, int height, int srcStride,
                                        int dst1Stride, int dst2Stride)
  {
      int h;
  
-     for (h=0; h < height; h++) {
+     for (h = 0; h < height; h++) {
 -        RENAME(ff_nv12ToUV)(dst1, dst2, src, NULL, width, NULL);
 +        RENAME(ff_nv12ToUV)(dst1, dst2, NULL, src, NULL, width, NULL);
-         src += srcStride;
+         src  += srcStride;
          dst1 += dst1Stride;
          dst2 += dst2Stride;
      }