[MPlayer-cvslog] CVS: main/libmpcodecs vd_lzo.c,1.7,1.8

Reimar Döffinger CVS syncmail at mplayerhq.hu
Sun Apr 9 20:26:08 CEST 2006


CVS change done by Reimar Döffinger CVS

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

Modified Files:
	vd_lzo.c 
Log Message:
10l, we should really, really use lzo1x_decompress_safe instead of lzo1x_decompress


Index: vd_lzo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_lzo.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vd_lzo.c	8 Mar 2006 10:50:16 -0000	1.7
+++ vd_lzo.c	9 Apr 2006 18:25:30 -0000	1.8
@@ -119,7 +119,8 @@
 	    );
 
 	/* decompress the frame */
-	r = lzo1x_decompress (data, len, tmp, &w, priv->wrkmem);
+	w = sh->bih->biSizeImage;
+	r = lzo1x_decompress_safe (data, len, tmp, &w, priv->wrkmem);
 	free(tmp);
 
 	if (r != LZO_E_OK) {
@@ -154,7 +155,8 @@
 	    return NULL;
     }
 
-    r = lzo1x_decompress (data, len, mpi->planes[0], &w, priv->wrkmem);
+    w = mpi->w * mpi->h;
+    r = lzo1x_decompress_safe (data, len, mpi->planes[0], &w, priv->wrkmem);
     if (r != LZO_E_OK) {
 	/* this should NEVER happen */
 	mp_msg (MSGT_DECVIDEO, MSGL_ERR, 




More information about the MPlayer-cvslog mailing list