summaryrefslogtreecommitdiff
path: root/libavcodec/vp9.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2014-01-22 20:51:54 -0500
committerClément Bœsch <u@pkh.me>2014-02-09 18:07:14 +0100
commit1dc8559e25b4e51fa0c0570a43fa085c0e5ac23b (patch)
treef9f8b51d079c750bc997469f90986f425f443841 /libavcodec/vp9.c
parent0c30c8ddc1383547f66065286a90ff559e063a8f (diff)
vp9: more aligned zeroes.
Diffstat (limited to 'libavcodec/vp9.c')
-rw-r--r--libavcodec/vp9.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index 01cf4e9023..b612d533fe 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -1201,7 +1201,7 @@ static void fill_mv(VP9Context *s,
VP9Block *b = s->b;
if (mode == ZEROMV) {
- memset(mv, 0, sizeof(*mv) * 2);
+ AV_ZERO64(mv);
} else {
int hp;
@@ -1317,7 +1317,8 @@ static void decode_mode(AVCodecContext *ctx)
memset(&s->above_segpred_ctx[col], 0, w4);
memset(&s->left_segpred_ctx[row7], 0, h4);
}
- if ((s->segmentation.enabled && s->segmentation.update_map) || s->keyframe) {
+ if (s->segmentation.enabled &&
+ (s->segmentation.update_map || s->keyframe || s->intraonly)) {
uint8_t *segmap = s->frames[CUR_FRAME].segmentation_map;
for (y = 0; y < h4; y++)