Merge commit 'bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51'

[ffmpeg] / libavcodec / mpeg12dec.c

diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index f7e57f934d9d3451bcc0c735cddcf4fb26f8f080..a5622bf19ebf584f0c14599a525503211fdb3481 100644 (file)
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -957,7 +957,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64])
                                 av_dlog(s->avctx, "fmx=%d\n", val);
                                 val = mpeg_decode_motion(s, s->mpeg_f_code[i][1],
                                                          s->last_mv[i][j][1] >> 1);
-                                s->last_mv[i][j][1] = val << 1;
+                                s->last_mv[i][j][1] = 2 * val;
                                 s->mv[i][j][1]      = val;
                                 av_dlog(s->avctx, "fmy=%d\n", val);
                             }