Merge commit 'd37c96213a2a9e1fd8669122d5405f4ce6a99ed8'

* commit 'd37c96213a2a9e1fd8669122d5405f4ce6a99ed8':
  lavc: restore copy_block{4,16} functions

Conflicts:
	libavcodec/copy_block.h

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

libavcodec/copy_block.h

@@ -37,8 +37,7 @@ static inline void copy_block2(uint8_t *dst, const uint8_t *src, int dstStride,
 static inline void copy_block4(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
 {
     int i;
-    for(i=0; i<h; i++)
-    {
+    for (i = 0; i < h; i++) {
         AV_COPY32U(dst, src);
         dst += dstStride;
         src += srcStride;
@@ -55,23 +54,22 @@ static inline void copy_block8(uint8_t *dst, const uint8_t *src, int dstStride,
     }
 }
 
-static inline void copy_block16(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
+static inline void copy_block9(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
 {
     int i;
-    for(i=0; i<h; i++)
-    {
-        AV_COPY128U(dst, src);
+    for (i = 0; i < h; i++) {
+        AV_COPY64U(dst, src);
+        dst[8] = src[8];
         dst   += dstStride;
         src   += srcStride;
     }
 }
 
-static inline void copy_block9(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
+static inline void copy_block16(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
 {
     int i;
     for (i = 0; i < h; i++) {
-        AV_COPY64U(dst, src);
-        dst[8] = src[8];
+        AV_COPY128U(dst, src);
         dst += dstStride;
         src += srcStride;
     }