diff options
author | John Koleszar <jkoleszar@google.com> | 2010-09-21 09:06:59 -0700 |
---|---|---|
committer | Code Review <code-review@webmproject.org> | 2010-09-21 09:06:59 -0700 |
commit | 6f4c0435d1162ba5b08ca5f586dc8b4df0e6b9e7 (patch) | |
tree | 69ef186a585734d9f91f457a6f049ea0f36aeb34 /vp8/decoder/decodemv.c | |
parent | 3d5f8291b1da4a6dc9209132c593fa6140e5c7ea (diff) | |
parent | 4d391e8ed281c58bfa36e864050091f2934a7097 (diff) | |
download | libvpx-6f4c0435d1162ba5b08ca5f586dc8b4df0e6b9e7.tar libvpx-6f4c0435d1162ba5b08ca5f586dc8b4df0e6b9e7.tar.gz libvpx-6f4c0435d1162ba5b08ca5f586dc8b4df0e6b9e7.tar.bz2 libvpx-6f4c0435d1162ba5b08ca5f586dc8b4df0e6b9e7.zip |
Merge "Don't reset mb clamping state during splitmv decoding"
Diffstat (limited to 'vp8/decoder/decodemv.c')
-rwxr-xr-x | vp8/decoder/decodemv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/decoder/decodemv.c b/vp8/decoder/decodemv.c index e9281f7ae..106dbde06 100755 --- a/vp8/decoder/decodemv.c +++ b/vp8/decoder/decodemv.c @@ -394,7 +394,7 @@ void vp8_read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, break; } - mbmi->need_to_clamp_mvs = (mv->col < mb_to_left_edge) ? 1 : 0; + mbmi->need_to_clamp_mvs |= (mv->col < mb_to_left_edge) ? 1 : 0; mbmi->need_to_clamp_mvs |= (mv->col > mb_to_right_edge) ? 1 : 0; mbmi->need_to_clamp_mvs |= (mv->row < mb_to_top_edge) ? 1 : 0; mbmi->need_to_clamp_mvs |= (mv->row > mb_to_bottom_edge) ? 1 : 0; |