Merge commit '0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5'

[ffmpeg] / libavcodec / h261dec.c

diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c
index 9064f1a0125698313261186214888905e16487fc..e9a3a8bcaa94ed29cbfa3aeb8f4ab1630c3cf1db 100644 (file)
--- 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);
     }