]> granicus.if.org Git - libvpx/commitdiff
Import another decoder bug fix from public stable branch
authorAuthor: John Koleszar <jkoleszar@google.com>
Wed, 1 Feb 2012 22:40:15 +0000 (14:40 -0800)
committerYaowu Xu <yaowu@google.com>
Wed, 1 Feb 2012 22:56:12 +0000 (14:56 -0800)
Please see the following for details:
https://gerrit.chromium.org/gerrit/#change,10925

Change-Id: Ie692261c255c58d7762df22eeca566a7d13adcba

vp8/decoder/decodemv.c

index c5e75d26d87dbb19ea0aff79a04ca3bd990bbd3f..5e00922e4b8ae75032d3b0b861431450d9c63e1a 100644 (file)
@@ -685,6 +685,7 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
             const int num_p = vp8_mbsplit_count [s];
             int j = 0;
 
+            mbmi->need_to_clamp_mvs = 0;
             do  /* for each subset j */
             {
                 int_mv leftmv, abovemv;
@@ -729,7 +730,7 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
                     break;
                 }
 
-                mbmi->need_to_clamp_mvs = vp8_check_mv_bounds(&blockmv,
+                mbmi->need_to_clamp_mvs |= vp8_check_mv_bounds(&blockmv,
                                                           mb_to_left_edge,
                                                           mb_to_right_edge,
                                                           mb_to_top_edge,