virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity

vc1dec: drop old use_ic code from vc1_b_mc

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-24 21:56:34 +02:00
parent 100184ccff
commit 12e3c1bee4
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/vc1dec.c
View File

@ -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], static inline void vc1_b_mc(VC1Context *v, int dmv_x[2], int dmv_y[2],
int direct, int mode) 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) { if (direct) {
vc1_mc_1mv(v, 0); vc1_mc_1mv(v, 0);
vc1_interp_mc(v); vc1_interp_mc(v);
if (use_ic)
v->mv_mode = v->mv_mode2;
return; return;
} }
if (mode == BMV_TYPE_INTERPOLATED) { if (mode == BMV_TYPE_INTERPOLATED) {
vc1_mc_1mv(v, 0); vc1_mc_1mv(v, 0);
vc1_interp_mc(v); vc1_interp_mc(v);
if (use_ic)
v->mv_mode = v->mv_mode2;
return; return;
} }
if (use_ic && (mode == BMV_TYPE_BACKWARD))
v->mv_mode = v->mv_mode2;
vc1_mc_1mv(v, (mode == BMV_TYPE_BACKWARD)); 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], static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2],