mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2025-02-15 17:39:45 +00:00
Merge commit 'bc75b64cff37d58f3944e2da3da45c37f35f019a'
* commit 'bc75b64cff37d58f3944e2da3da45c37f35f019a': vc1pred: remove logically dead code Conflicts: libavcodec/vc1_pred.c See: fca435fee167da981f024e35d9fef4e6179b8061 Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
0aa208837e
@ -648,7 +648,7 @@ void ff_vc1_pred_mv_intfr(VC1Context *v, int n, int dmv_x, int dmv_y,
|
||||
av_assert1(c_valid);
|
||||
px = C[0];
|
||||
py = C[1];
|
||||
} /*else px = py = 0;*/
|
||||
}
|
||||
} else {
|
||||
if (field_a && a_valid) {
|
||||
px = A[0];
|
||||
@ -657,10 +657,7 @@ void ff_vc1_pred_mv_intfr(VC1Context *v, int n, int dmv_x, int dmv_y,
|
||||
av_assert1(field_b && b_valid);
|
||||
px = B[0];
|
||||
py = B[1];
|
||||
} /*else if (c_valid) {
|
||||
px = C[0];
|
||||
py = C[1];
|
||||
}*/
|
||||
}
|
||||
}
|
||||
} else if (total_valid == 1) {
|
||||
px = (a_valid) ? A[0] : ((b_valid) ? B[0] : C[0]);
|
||||
|
Loading…
x
Reference in New Issue
Block a user