[FFmpeg-cvslog] avcodec/h261dec: Fix exported MVs for skipped MBs

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb  1 18:48:23 2015 +0100| [61aca123fb30e6c99948b12a829ddf7afe1a4174] | committer: Michael Niedermayer

avcodec/h261dec: Fix exported MVs for skipped MBs

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61aca123fb30e6c99948b12a829ddf7afe1a4174
---

 libavcodec/h261dec.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c
index 9064f1a..e9a3a8b 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);
     }