From 61aca123fb30e6c99948b12a829ddf7afe1a4174 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 1 Feb 2015 18:48:23 +0100 Subject: [PATCH] avcodec/h261dec: Fix exported MVs for skipped MBs Signed-off-by: Michael Niedermayer --- libavcodec/h261dec.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 9064f1a012..e9a3a8bcaa 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -216,6 +216,13 @@ static int h261_decode_mb_skipped(H261Context *h, int mba1, int mba2) s->mb_skipped = 1; h->mtype &= ~MB_TYPE_H261_FIL; + if (s->current_picture.motion_val[0]) { + int b_stride = 2*s->mb_width + 1; + int b_xy = 2 * s->mb_x + (2 * s->mb_y) * b_stride; + s->current_picture.motion_val[0][b_xy][0] = s->mv[0][0][0]; + s->current_picture.motion_val[0][b_xy][1] = s->mv[0][0][1]; + } + ff_mpv_decode_mb(s, s->block); }