[FFmpeg-cvslog] vc1dec: drop old use_ic code from vc1_b_mc

Michael Niedermayer git at videolan.org
Wed Apr 24 23:04:52 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 24 21:56:34 2013 +0200| [12e3c1bee487f6961d92ceaa204891f73adc87a6] | committer: Michael Niedermayer

vc1dec: drop old use_ic code from vc1_b_mc

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12e3c1bee487f6961d92ceaa204891f73adc87a6
---

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

diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 442a69b..696a4dd 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -2054,31 +2054,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],



More information about the ffmpeg-cvslog mailing list