mpegvideo: Avoid 32-bit wrapping of linesize multiplications
authorMartin Storsjö <martin@martin.st>
Tue, 3 Sep 2013 22:36:51 +0000 (01:36 +0300)
committerSean McGovern <gseanmcg@gmail.com>
Mon, 23 Sep 2013 23:53:02 +0000 (19:53 -0400)
This makes sure that linesize * start_y doesn't overflow, so that
emulated_edge_mc can get back the original value if needed.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit a711a2cb473dc95708f371a82c85c97fe789b5c2)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
libavcodec/mpegvideo_common.h

index e8daf2e..763c319 100644 (file)
@@ -244,7 +244,8 @@ void mpeg_motion_internal(MpegEncContext *s,
 {
     uint8_t *ptr_y, *ptr_cb, *ptr_cr;
     int dxy, uvdxy, mx, my, src_x, src_y,
-        uvsrc_x, uvsrc_y, v_edge_pos, uvlinesize, linesize;
+        uvsrc_x, uvsrc_y, v_edge_pos;
+    ptrdiff_t uvlinesize, linesize;
 
 #if 0
 if(s->quarter_sample)