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/dxtory.c | |
| 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/dxtory.c')
| -rw-r--r-- | libavcodec/dxtory.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c index f741078092..da43c47003 100644 --- a/libavcodec/dxtory.c +++ b/libavcodec/dxtory.c @@ -70,8 +70,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, V = pic->data[2]; for (h = 0; h < avctx->height; h += 2) { for (w = 0; w < avctx->width; w += 2) { - AV_WN16A(Y1 + w, AV_RN16A(src)); - AV_WN16A(Y2 + w, AV_RN16A(src + 2)); + AV_COPY16(Y1 + w, src); + AV_COPY16(Y2 + w, src + 2); U[w >> 1] = src[4] + 0x80; V[w >> 1] = src[5] + 0x80; src += 6; |