Commit 03e4c2d8 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'd37c9621'

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

Conflicts:
	libavcodec/copy_block.h
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 773eb74b d37c9621
......@@ -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,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);
dst+=dstStride;
src+=srcStride;
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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment