har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vc1dec: Fix mv_f shuffling

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-24 13:16:27 +02:00
parent 62d9445396
commit 1d0f817b17
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/vc1dec.c
View File

@ -6014,6 +6014,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
s->current_picture.f.linesize[2] <<= 1; s->current_picture.f.linesize[2] <<= 1;
s->linesize <<= 1; s->linesize <<= 1;
s->uvlinesize <<= 1; s->uvlinesize <<= 1;
if (v->s.pict_type != AV_PICTURE_TYPE_BI && v->s.pict_type != AV_PICTURE_TYPE_B) {
tmp[0] = v->mv_f_last[0]; tmp[0] = v->mv_f_last[0];
tmp[1] = v->mv_f_last[1]; tmp[1] = v->mv_f_last[1];
v->mv_f_last[0] = v->mv_f_next[0]; v->mv_f_last[0] = v->mv_f_next[0];
@ -6023,6 +6024,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
v->mv_f[0] = tmp[0]; v->mv_f[0] = tmp[0];
v->mv_f[1] = tmp[1]; v->mv_f[1] = tmp[1];
} }
}
mb_height = s->mb_height >> v->field_mode; mb_height = s->mb_height >> v->field_mode;
for (i = 0; i <= n_slices; i++) { for (i = 0; i <= n_slices; i++) {
if (i > 0 && slices[i - 1].mby_start >= mb_height) { if (i > 0 && slices[i - 1].mby_start >= mb_height) {