RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Michael Niedermayer 2012-10-11 14:36:30 +02:00
parent ce27c9eb25 eb657ecefd
commit a75dd13b1b
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/vc1dec.c
View File

@ -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 (num_samefield <= num_oppfield)
opposite = 1 - pred_flag;
else
opposite = pred_flag;
if (!v->numref)
// REFFIELD determines if the last field or the second-last field is
// to be used as reference
opposite = 1 - v->reffield;
else {
if (num_samefield <= num_oppfield)
opposite = 1 - pred_flag;
else
opposite = pred_flag;
}
} else
opposite = 0;
if (opposite) {