wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'd37c96213a'

Browse source 
* commit 'd37c96213a':
  lavc: restore copy_block{4,16} functions

Conflicts:
	libavcodec/copy_block.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-28 03:26:43 +01:00
commit 03e4c2d833
1 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
libavcodec/copy_block.h
View file

@ -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;