From 1d0f817b17d72e6e02ab1edd03df57f5a92b32ff Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 24 Apr 2013 13:16:27 +0200 Subject: [PATCH] vc1dec: Fix mv_f shuffling Signed-off-by: Michael Niedermayer --- libavcodec/vc1dec.c | 2 ++ 1 file changed, 2 insertions(+) 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++) {