Merge commit '9047491f'

* commit '9047491f':
  swscale: add nv12/nv21->yuv420 converter

Conflicts:
	libswscale/rgb2rgb.c
	libswscale/rgb2rgb_template.c

See: ef627bf9Merged-by: Michael Niedermayer <michaelni@gmx.at>

libswscale/rgb2rgb.c

@@ -84,8 +84,8 @@ void (*interleaveBytes)(const uint8_t *src1, const uint8_t *src2, uint8_t *dst,
                         int width, int height, int src1Stride,
                         int src2Stride, int dstStride);
 void (*deinterleaveBytes)(const uint8_t *src, uint8_t *dst1, uint8_t *dst2,
-                        int width, int height, int srcStride,
-                        int dst1Stride, int dst2Stride);
+                          int width, int height, int srcStride,
+                          int dst1Stride, int dst2Stride);
 void (*vu9_to_vu12)(const uint8_t *src1, const uint8_t *src2,
                     uint8_t *dst1, uint8_t *dst2,
                     int width, int height,

libswscale/rgb2rgb_template.c

@@ -705,7 +705,7 @@ static void deinterleaveBytes_c(const uint8_t *src, uint8_t *dst1, uint8_t *dst2
             dst1[w] = src[2 * w + 0];
             dst2[w] = src[2 * w + 1];
         }
-        src += srcStride;
+        src  += srcStride;
         dst1 += dst1Stride;
         dst2 += dst2Stride;
     }