diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 14:01:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 14:01:36 +0200 |
| commit | 5555d2075a26fc778fb8145473100e94d80a00c8 (patch) | |
| tree | 95d4f5649f7c2410d814b18c7bbe868c82b83cbe /libavcodec/dsputil.h | |
| parent | f3b8096bc0e7df9e45db1023d6e6e7bff177d0c4 (diff) | |
| parent | ceb754d041f5f6327fd9195a5f43575af9516daa (diff) | |
| download | ffmpeg-5555d2075a26fc778fb8145473100e94d80a00c8.tar.gz | |
Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa'
* commit 'ceb754d041f5f6327fd9195a5f43575af9516daa':
lzo: Use AV_COPY*U macros where appropriate
prepare 9_beta2 release
dsputil: Replace AV_WNxx(AV_RNxx()) combinations by AV_COPYxxU
intreadwrite: Add AV_COPYxxU macros for copying to/from unaligned addresses
dxtory: Replace AV_WN16A(AV_RN16A()) combination by AV_COPY16
mp3: properly forward mp_decode_frame errors
Conflicts:
RELEASE
libavcodec/mpegaudiodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index ad09a0cd43..ecd425964d 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -674,7 +674,7 @@ static inline void copy_block2(uint8_t *dst, const uint8_t *src, int dstStride, int i; for(i=0; i<h; i++) { - AV_WN16(dst , AV_RN16(src )); + AV_COPY16U(dst, src); dst+=dstStride; src+=srcStride; } @@ -685,7 +685,7 @@ static inline void copy_block4(uint8_t *dst, const uint8_t *src, int dstStride, int i; for(i=0; i<h; i++) { - AV_WN32(dst , AV_RN32(src )); + AV_COPY32U(dst, src); dst+=dstStride; src+=srcStride; } @@ -696,8 +696,7 @@ static inline void copy_block8(uint8_t *dst, const uint8_t *src, int dstStride, int i; for(i=0; i<h; i++) { - AV_WN32(dst , AV_RN32(src )); - AV_WN32(dst+4 , AV_RN32(src+4 )); + AV_COPY64U(dst, src); dst+=dstStride; src+=srcStride; } @@ -708,8 +707,7 @@ static inline void copy_block9(uint8_t *dst, const uint8_t *src, int dstStride, int i; for(i=0; i<h; i++) { - AV_WN32(dst , AV_RN32(src )); - AV_WN32(dst+4 , AV_RN32(src+4 )); + AV_COPY64U(dst, src); dst[8]= src[8]; dst+=dstStride; src+=srcStride; @@ -721,10 +719,7 @@ static inline void copy_block16(uint8_t *dst, const uint8_t *src, int dstStride, int i; for(i=0; i<h; i++) { - AV_WN32(dst , AV_RN32(src )); - AV_WN32(dst+4 , AV_RN32(src+4 )); - AV_WN32(dst+8 , AV_RN32(src+8 )); - AV_WN32(dst+12, AV_RN32(src+12)); + AV_COPY128U(dst, src); dst+=dstStride; src+=srcStride; } @@ -735,10 +730,7 @@ static inline void copy_block17(uint8_t *dst, const uint8_t *src, int dstStride, int i; for(i=0; i<h; i++) { - AV_WN32(dst , AV_RN32(src )); - AV_WN32(dst+4 , AV_RN32(src+4 )); - AV_WN32(dst+8 , AV_RN32(src+8 )); - AV_WN32(dst+12, AV_RN32(src+12)); + AV_COPY128U(dst, src); dst[16]= src[16]; dst+=dstStride; src+=srcStride; |