diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-09 18:25:35 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-09 18:25:35 +0000 |
| commit | eae97616d57c8506985ae0f202d57ee396c17ba1 (patch) | |
| tree | 445bcda4193d0c605e9fbebf22bc66e39ac1dd16 /libmpcodecs/vd_lzo.c | |
| parent | ed8211b89caaadd3360b8b5a90fc809a0aa48483 (diff) | |
| download | mpv-eae97616d57c8506985ae0f202d57ee396c17ba1.tar.bz2 mpv-eae97616d57c8506985ae0f202d57ee396c17ba1.tar.xz | |
10l, we should really, really use lzo1x_decompress_safe instead of lzo1x_decompress
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18069 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/vd_lzo.c')
| -rw-r--r-- | libmpcodecs/vd_lzo.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libmpcodecs/vd_lzo.c b/libmpcodecs/vd_lzo.c index bce7d929d5..d4543998a4 100644 --- a/libmpcodecs/vd_lzo.c +++ b/libmpcodecs/vd_lzo.c @@ -119,7 +119,8 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags) ); /* 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 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags) 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, |