[MPlayer-cvslog] CVS: main/libmpcodecs vd_ffmpeg.c,1.146,1.147

[Jindrich Makovicka CVS]

CVS change done by Jindrich Makovicka CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv25057

Modified Files:
	vd_ffmpeg.c 
Log Message:
correcting the previous draw_slice fix
- don't draw slices beyond sh->disp_h
- draw slices sh->disp_w wide to avoid buffer overflow in VO


Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- vd_ffmpeg.c	7 Jun 2005 06:33:51 -0000	1.146
+++ vd_ffmpeg.c	7 Jun 2005 10:04:22 -0000	1.147
@@ -451,11 +451,13 @@
         }
     }else
 #endif
+    if (y < sh->disp_h) {
 #if LIBAVCODEC_BUILD >= 4670
-        mpcodecs_draw_slice (sh, source, src->linesize, width, (y+16)<=sh->disp_h?height:sh->disp_h-y, 0, y);
+        mpcodecs_draw_slice (sh, source, src->linesize, sh->disp_w, (y+16)<=sh->disp_h?height:sh->disp_h-y, 0, y);
 #else
-        mpcodecs_draw_slice (sh,src, stride, width, (y+16)<=sh->disp_h?height:sh->disp_h-y, 0, y);
+        mpcodecs_draw_slice (sh,src, stride, sh->disp_w, (y+16)<=sh->disp_h?height:sh->disp_h-y, 0, y);
 #endif
+    }
 }