diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-24 21:56:34 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-05-28 13:56:08 +0300 |
| commit | b412f705b58ececaeef4ca904b89f00612ac129e (patch) | |
| tree | 16e653b360cd49fd52c17e55b456733de2110cb1 /libavcodec/vc1dec.c | |
| parent | 5053a9a1ffd907ae1d189c03c7e86bb375a44ded (diff) | |
| download | ffmpeg-b412f705b58ececaeef4ca904b89f00612ac129e.tar.gz | |
vc1dec: Drop old use_ic code from vc1_b_mc
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/vc1dec.c')
| -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 01c3f5fa6c..fb0c5c288b 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], |