[SCM] libav/experimental: lavc: restore copy_block{4,16} functions

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d37c96213a2a9e1fd8669122d5405f4ce6a99ed8
Author: Vittorio Giovara <vittorio.giovara at gmail.com>
Date:   Mon Mar 10 17:05:12 2014 +0100

    lavc: restore copy_block{4,16} functions
    
    They were removed in 9e31729d692f1e721b7ed1a3a0f51b68c064d68f.

diff --git a/libavcodec/copy_block.h b/libavcodec/copy_block.h
index 5dfdabc..10718cc 100644
--- a/libavcodec/copy_block.h
+++ b/libavcodec/copy_block.h
@@ -23,6 +23,16 @@
 
 #include "libavutil/intreadwrite.h"
 
+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++) {
+        AV_COPY32U(dst, src);
+        dst += dstStride;
+        src += srcStride;
+    }
+}
+
 static inline void copy_block8(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
 {
     int i;
@@ -44,6 +54,16 @@ static inline void copy_block9(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)
+{
+    int i;
+    for (i = 0; i < h; i++) {
+        AV_COPY128U(dst, src);
+        dst += dstStride;
+        src += srcStride;
+    }
+}
+
 static inline void copy_block17(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
 {
     int i;

-- 
Libav/FFmpeg packaging