summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-24 13:16:27 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-24 13:16:27 +0200
commit1d0f817b17d72e6e02ab1edd03df57f5a92b32ff (patch)
treef5677b5ecba4918c676f30514a7837699bd399c6 /libavcodec
parent62d944539683d67f1dc454cb17da0bb51d61e0ec (diff)
vc1dec: Fix mv_f shuffling
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/vc1dec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 08bbb88ba5..50e47e7784 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -6014,6 +6014,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
s->current_picture.f.linesize[2] <<= 1;
s->linesize <<= 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[1] = v->mv_f_last[1];
v->mv_f_last[0] = v->mv_f_next[0];
@@ -6022,6 +6023,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
v->mv_f_next[1] = v->mv_f[1];
v->mv_f[0] = tmp[0];
v->mv_f[1] = tmp[1];
+ }
}
mb_height = s->mb_height >> v->field_mode;
for (i = 0; i <= n_slices; i++) {