diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-01-22 11:39:24 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-22 11:39:24 -0800 |
| commit | 528bf858fa2fee989df9744adf858157d7d8a0b0 (patch) | |
| tree | 798ab7002c3e40d3ede35daa169214b49a895c8d /vp9 | |
| parent | 4ea56c0126625aa3918abd0b0443c7e362755f9f (diff) | |
| parent | ebe160568b163bfae72f654ee517a12d838d8595 (diff) | |
| download | libvpx-528bf858fa2fee989df9744adf858157d7d8a0b0.tar libvpx-528bf858fa2fee989df9744adf858157d7d8a0b0.tar.gz libvpx-528bf858fa2fee989df9744adf858157d7d8a0b0.tar.bz2 libvpx-528bf858fa2fee989df9744adf858157d7d8a0b0.zip | |
Merge "Prevent invaid memory access"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 9966cb6ae..9d02c8f95 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -500,7 +500,7 @@ static void update_state(VP9_COMP *cpi, PICK_MODE_CONTEXT *ctx, if (is_inter_block(mbmi) && (mbmi->sb_type < BLOCK_8X8 || mbmi->mode == NEWMV)) { int_mv best_mv[2]; - for (i = 0; i < 2; ++i) + for (i = 0; i < 1 + has_second_ref(mbmi); ++i) best_mv[i].as_int = mbmi->ref_mvs[mbmi->ref_frame[i]][0].as_int; vp9_update_mv_count(cpi, x, best_mv); } |