diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-24 21:56:34 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-24 21:56:34 +0200 |
commit | 12e3c1bee487f6961d92ceaa204891f73adc87a6 (patch) | |
tree | 888965ccbc69fa89f8649bf45e7a38bc7a07ed49 /libavcodec | |
parent | 100184ccffbf8a25098a943b71b1cd2e599de2ec (diff) | |
download | ffmpeg-12e3c1bee487f6961d92ceaa204891f73adc87a6.tar.gz |
vc1dec: drop old use_ic code from vc1_b_mc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/vc1dec.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 442a69b489..696a4ddd62 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], |