diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-06-06 15:51:23 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-06-06 15:51:23 -0400 |
| commit | 84f5b14b0ed878739533dabe63498311582da4b1 (patch) | |
| tree | ce8e5178aeb5c38acc4dcd2134dc731f2a564acf /vp8/decoder | |
| parent | be15a099806347111cf461371f4fef0e783fd548 (diff) | |
| parent | d1c0ba8f7ac88336ce7bbfa7dadd5c7319953fd4 (diff) | |
| download | libvpx-84f5b14b0ed878739533dabe63498311582da4b1.tar libvpx-84f5b14b0ed878739533dabe63498311582da4b1.tar.gz libvpx-84f5b14b0ed878739533dabe63498311582da4b1.tar.bz2 libvpx-84f5b14b0ed878739533dabe63498311582da4b1.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/decoder')
| -rw-r--r-- | vp8/decoder/decodemv.c | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/vp8/decoder/decodemv.c b/vp8/decoder/decodemv.c index d63887744..73d2518cc 100644 --- a/vp8/decoder/decodemv.c +++ b/vp8/decoder/decodemv.c @@ -472,18 +472,18 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, /* Clip "next_nearest" so that it does not extend to far out of image */ vp8_clamp_mv(mv, mb_to_left_edge, mb_to_right_edge, mb_to_top_edge, mb_to_bottom_edge); - goto propagate_mv; + break; case NEARESTMV: mv->as_int = nearest.as_int; /* Clip "next_nearest" so that it does not extend to far out of image */ vp8_clamp_mv(mv, mb_to_left_edge, mb_to_right_edge, mb_to_top_edge, mb_to_bottom_edge); - goto propagate_mv; + break; case ZEROMV: mv->as_int = 0; - goto propagate_mv; + break; case NEWMV: read_mv(bc, &mv->as_mv, (const MV_CONTEXT *) mvc); @@ -500,27 +500,8 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, mb_to_right_edge, mb_to_top_edge, mb_to_bottom_edge); - - propagate_mv: /* same MV throughout */ - { - mi->bmi[ 0].mv.as_int = - mi->bmi[ 1].mv.as_int = - mi->bmi[ 2].mv.as_int = - mi->bmi[ 3].mv.as_int = - mi->bmi[ 4].mv.as_int = - mi->bmi[ 5].mv.as_int = - mi->bmi[ 6].mv.as_int = - mi->bmi[ 7].mv.as_int = - mi->bmi[ 8].mv.as_int = - mi->bmi[ 9].mv.as_int = - mi->bmi[10].mv.as_int = - mi->bmi[11].mv.as_int = - mi->bmi[12].mv.as_int = - mi->bmi[13].mv.as_int = - mi->bmi[14].mv.as_int = - mi->bmi[15].mv.as_int = mv->as_int; - } break; + default:; #if CONFIG_DEBUG assert(0); |