summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/copy_block.h28
1 files changed, 13 insertions, 15 deletions
diff --git a/libavcodec/copy_block.h b/libavcodec/copy_block.h
index 42022dfeaf..9ed451f294 100644
--- a/libavcodec/copy_block.h
+++ b/libavcodec/copy_block.h
@@ -37,11 +37,10 @@ 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;
+ dst += dstStride;
+ src += srcStride;
}
}
@@ -55,17 +54,6 @@ 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)
-{
- int i;
- for(i=0; i<h; i++)
- {
- AV_COPY128U(dst, src);
- dst+=dstStride;
- src+=srcStride;
- }
-}
-
static inline void copy_block9(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
{
int i;
@@ -77,6 +65,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;