Merge commit 'eb657ecefdeb8b2ed9bfb55d3c2c9e0f568486bf'
* commit 'eb657ecefdeb8b2ed9bfb55d3c2c9e0f568486bf': vc1dec: Set opposite to the correct value for 1REF field pictures Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
a75dd13b1b
@ -1460,10 +1460,16 @@ static inline void vc1_pred_mv(VC1Context *v, int n, int dmv_x, int dmv_y,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (v->field_mode) {
|
if (v->field_mode) {
|
||||||
if (num_samefield <= num_oppfield)
|
if (!v->numref)
|
||||||
opposite = 1 - pred_flag;
|
// REFFIELD determines if the last field or the second-last field is
|
||||||
else
|
// to be used as reference
|
||||||
opposite = pred_flag;
|
opposite = 1 - v->reffield;
|
||||||
|
else {
|
||||||
|
if (num_samefield <= num_oppfield)
|
||||||
|
opposite = 1 - pred_flag;
|
||||||
|
else
|
||||||
|
opposite = pred_flag;
|
||||||
|
}
|
||||||
} else
|
} else
|
||||||
opposite = 0;
|
opposite = 0;
|
||||||
if (opposite) {
|
if (opposite) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user