Merge commit '6d69f9f37689c999815a65a2d99999fad3a41705'

* commit '6d69f9f37689c999815a65a2d99999fad3a41705': vp9: write uveob as 16-bit value for 16x16/32x32 transforms. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-25 13:55:37 +02:00 · 2014-04-25 13:55:37 +02:00 · 2f2629c870
commit 2f2629c870
parent c7b089048d 6d69f9f376
1 changed files with 5 additions and 1 deletions
--- 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; \
+            } \
        } \
    }