[05/15] vc1dec: Drop old use_ic code from vc1_b_mc

Message ID 1369729571-75967-5-git-send-email-martin@martin.st
State Committed
Commit b412f705b58ececaeef4ca904b89f00612ac129e
Headers show

Commit Message

Martin Storsjö May 28, 2013, 8:26 a.m.
From: Michael Niedermayer <michaelni@gmx.at>

---
 libavcodec/vc1dec.c |   13 -------------
 1 file changed, 13 deletions(-)

Comments

Kostya Shishkov May 28, 2013, 9:05 a.m. | #1
On Tue, May 28, 2013 at 11:26:01AM +0300, Martin Storsjö wrote:
> From: Michael Niedermayer <michaelni@gmx.at>
> 
> ---
>  libavcodec/vc1dec.c |   13 -------------
>  1 file changed, 13 deletions(-)

looks good enough

Patch

diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 89ad577..1581633 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -2034,31 +2034,18 @@  static av_always_inline int scale_mv(int value, int bfrac, int inv, int qs)
 static inline void vc1_b_mc(VC1Context *v, int dmv_x[2], int dmv_y[2],
                             int direct, int mode)
 {
-    int use_ic = v->next_use_ic || v->curr_use_ic || v->last_use_ic;
-    if (use_ic) {
-        v->mv_mode2 = v->mv_mode;
-        v->mv_mode  = MV_PMODE_INTENSITY_COMP;
-    }
     if (direct) {
         vc1_mc_1mv(v, 0);
         vc1_interp_mc(v);
-        if (use_ic)
-            v->mv_mode = v->mv_mode2;
         return;
     }
     if (mode == BMV_TYPE_INTERPOLATED) {
         vc1_mc_1mv(v, 0);
         vc1_interp_mc(v);
-        if (use_ic)
-            v->mv_mode = v->mv_mode2;
         return;
     }
 
-    if (use_ic && (mode == BMV_TYPE_BACKWARD))
-        v->mv_mode = v->mv_mode2;
     vc1_mc_1mv(v, (mode == BMV_TYPE_BACKWARD));
-    if (use_ic)
-        v->mv_mode = v->mv_mode2;
 }
 
 static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2],