summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-25 13:55:37 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-25 13:55:44 +0200
commit2f2629c8700b5b39450af7cd29171189d8069ea5 (patch)
tree8d88ce4be4cc760086f14711028feeba35bc27d6
parentc7b089048dbedb56c4ea51c0fe88659d073fe7c0 (diff)
parent6d69f9f37689c999815a65a2d99999fad3a41705 (diff)
Merge commit '6d69f9f37689c999815a65a2d99999fad3a41705'
* commit '6d69f9f37689c999815a65a2d99999fad3a41705': vp9: write uveob as 16-bit value for 16x16/32x32 transforms. Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/vp9.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index d970709c39..000e9918a5 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -2258,7 +2258,11 @@ static void decode_coeffs(AVCodecContext *ctx)
16 * step * step, c, e, p, a[x] + l[y], \
uvscan, uvnb, uv_band_counts, qmul[1]); \
a[x] = l[y] = !!res; \
- s->uveob[pl][n] = res; \
+ if (step >= 4) { \
+ AV_WN16A(&s->uveob[pl][n], res); \
+ } else { \
+ s->uveob[pl][n] = res; \
+ } \
} \
}